From 6947bb6e82e9c4a020b1b584d66e1823eb5c316b Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 25 Sep 2010 18:12:37 +0200 Subject: [PATCH] Changed: #825 Commented out all #pragma message --- code/ryzom/client/src/far_tp.cpp | 4 +- code/ryzom/client/src/property_decoder.cpp | 4 +- .../common/src/game_share/action_position.cpp | 4 +- .../ryzom/common/src/game_share/bnp_patch.cpp | 24 ++---- .../src/game_share/persistent_data_template.h | 4 +- .../common/src/game_share/type_skill_mod.cpp | 4 +- .../src/ai_service/ai_script_data_manager.cpp | 4 +- .../game_event_manager.cpp | 2 +- .../game_item_manager/game_item.cpp | 3 +- .../game_item_manager/player_inventory.cpp | 2 +- .../guild_manager/guild.cpp | 4 +- .../mission_manager/mission_queue.cpp | 4 +- .../mission_manager/mission_queue_manager.cpp | 4 +- .../outpost_manager/outpost.cpp | 2 +- .../outpost_manager/outpost_building.cpp | 2 +- .../outpost_manager/outpost_squad.cpp | 4 +- .../phrase_manager/chg_charac_effect.cpp | 2 +- .../phrase_manager/enchant_weapon_effect.cpp | 2 +- .../mod_craft_success_effect.cpp | 2 +- .../phrase_manager/mod_defense_effect.cpp | 2 +- .../mod_forage_success_effect.cpp | 2 +- .../mod_magic_protection_effet.cpp | 2 +- .../mod_magic_success_effect.cpp | 2 +- .../mod_melee_success_effect.cpp | 2 +- .../mod_range_success_effect.cpp | 2 +- .../phrase_manager/power_shielding_effect.cpp | 2 +- .../phrase_manager/s_effect.cpp | 4 +- .../character_name_extraction.cpp | 4 +- .../character_statistics_recorder.cpp | 4 +- .../player_manager/persistent_effect.cpp | 2 +- .../player_manager/persistent_player_data.cpp | 84 +++++++++---------- .../player_manager/ring_reward_points.cpp | 22 +++-- .../pvp_faction_reward_manager.cpp | 4 +- .../pvp_faction_reward_manager/totem_base.cpp | 2 +- .../shop_type/dynamic_items.cpp | 2 +- .../shop_type/item_for_sale.cpp | 2 +- .../shop_type/items_for_sale.cpp | 2 +- .../src/frontend_service/client_host.cpp | 4 +- .../src/frontend_service/uid_impulsions.cpp | 2 +- .../src/server_share/stat_db_tree_pd.cpp | 6 +- .../tools/patch_gen/patch_gen_common.cpp | 4 +- 41 files changed, 115 insertions(+), 128 deletions(-) diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp index 5edcce264..fd629a43c 100644 --- a/code/ryzom/client/src/far_tp.cpp +++ b/code/ryzom/client/src/far_tp.cpp @@ -751,9 +751,7 @@ retryJoinEdit: throw "Protocol error"; if (sb._LastJoinSessionResult == 16) { -#ifdef NL_OS_WINDOWS - #pragma message (NL_LOC_WRN "inform the player that he is banned from the ring") -#endif // NL_OS_WINDOWS +// #pragma message (NL_LOC_WRN "inform the player that he is banned from the ring") throw "User ban from the ring"; } if (sb._LastJoinSessionResult != 0) diff --git a/code/ryzom/client/src/property_decoder.cpp b/code/ryzom/client/src/property_decoder.cpp index 9fdb50e48..6c6832eb1 100644 --- a/code/ryzom/client/src/property_decoder.cpp +++ b/code/ryzom/client/src/property_decoder.cpp @@ -50,7 +50,7 @@ void CPropertyDecoder::receive(TPacketNumber /* packetNumber */, CAction *action CPropertyEntry &pz = _Entities[act->Slot].Properties[PROPERTY_POSZ]; */ #ifdef TEST_POSITION_CORRECTNESS -#pragma message ("TEST_POSITION_CORRECTNESS") +//#pragma message ("TEST_POSITION_CORRECTNESS") TCoord posx = (TCoord)(act->Position[0]); TCoord posy = (TCoord)(act->Position[1]); #endif @@ -87,7 +87,7 @@ void CPropertyDecoder::receive(TPacketNumber /* packetNumber */, CAction *action //nldebug("CLPROPD: Received position (Id=%d) %d,%d (Pck=%d)", act->CLEntityId, act->Position[0], act->Position[1], packetNumber); */ #ifdef TEST_POSITION_CORRECTNESS -#pragma message ("TEST_POSITION_CORRECTNESS") +//#pragma message ("TEST_POSITION_CORRECTNESS") if ( ! (act->IsRelative) ) { // Check if the compression algo for positions worked diff --git a/code/ryzom/common/src/game_share/action_position.cpp b/code/ryzom/common/src/game_share/action_position.cpp index 770bf8804..f6673dc54 100644 --- a/code/ryzom/common/src/game_share/action_position.cpp +++ b/code/ryzom/common/src/game_share/action_position.cpp @@ -71,7 +71,7 @@ void CActionPosition::unpack (NLMISC::CBitMemStream &message) Interior = (Position16[2] & (uint16)0x2)!=0; #ifdef TEST_POSITION_CORRECTNESS -#pragma message (NL_LOC_MSG "TEST_POSITION_CORRECTNESS") +//#pragma message (NL_LOC_MSG "TEST_POSITION_CORRECTNESS") TCoord px, py; message.serialAndLog1( px ); message.serialAndLog1( py ); @@ -138,7 +138,7 @@ void CActionPosition::pack (NLMISC::CBitMemStream &message) message.serialAndLog1( posz16 ); #ifdef TEST_POSITION_CORRECTNESS -#pragma message (NL_LOC_MSG "TEST_POSITION_CORRECTNESS") +//#pragma message (NL_LOC_MSG "TEST_POSITION_CORRECTNESS") TCoord px = Position[0]; TCoord py = Position[1]; message.serialAndLog1( px ); diff --git a/code/ryzom/common/src/game_share/bnp_patch.cpp b/code/ryzom/common/src/game_share/bnp_patch.cpp index b49f39724..071b03675 100644 --- a/code/ryzom/common/src/game_share/bnp_patch.cpp +++ b/code/ryzom/common/src/game_share/bnp_patch.cpp @@ -183,9 +183,7 @@ bool CBNPFileVersion::operator!=(const CBNPFileVersion& other) const PROP(uint32,_PatchSize) \ PROP_VECT(uint32,_HashKey) -#ifdef NL_OS_WINDOWS -# pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS +//# pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" #undef PERSISTENT_CLASS @@ -335,9 +333,7 @@ bool CBNPFile::isIncremental() PROP(std::string,_FileName)\ STRUCT_VECT(_Versions) -#ifdef NL_OS_WINDOWS -# pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS +//# pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" #undef PERSISTENT_CLASS @@ -450,9 +446,7 @@ void CBNPFileSet::addFile(const std::string& fileName,bool isIncremental) #define PERSISTENT_CLASS CBNPFileSet #define PERSISTENT_DATA\ STRUCT_VECT(_Files) -#ifdef NL_OS_WINDOWS -# pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS +//# pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" #undef PERSISTENT_CLASS @@ -572,9 +566,7 @@ void CBNPCategory::addFile(const std::string& fileName) LPROP(bool, _Hidden, if(_Hidden))\ PROP_VECT(std::string, _Files)\ -#ifdef NL_OS_WINDOWS -# pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS +//# pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" #undef PERSISTENT_CLASS @@ -724,9 +716,7 @@ bool CBNPCategorySet::isFileIncremental(const std::string& fileName) const #define PERSISTENT_CLASS CBNPCategorySet #define PERSISTENT_DATA\ STRUCT_VECT(_Category) -#ifdef NL_OS_WINDOWS -# pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS +//# pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" #undef PERSISTENT_CLASS @@ -815,9 +805,7 @@ void CProductDescriptionForClient::serial(NLMISC::IStream &f) STRUCT(_Files)\ STRUCT(_Categories) -#ifdef NL_OS_WINDOWS -# pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif //NL_OS_WINDOWS +//# pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" #undef PERSISTENT_CLASS diff --git a/code/ryzom/common/src/game_share/persistent_data_template.h b/code/ryzom/common/src/game_share/persistent_data_template.h index 1f9f9442a..ef76101cd 100644 --- a/code/ryzom/common/src/game_share/persistent_data_template.h +++ b/code/ryzom/common/src/game_share/persistent_data_template.h @@ -219,9 +219,7 @@ inline NLMISC::TGameCycle loadSecondToGameCycle(uint32 second) #ifdef PERSISTENT_TOKEN_FAMILY -#ifdef NL_OS_WINDOWS -#pragma message( "Using token family "NL_MACRO_TO_STR(PERSISTENT_TOKEN_FAMILY)" for persistent data class " NL_MACRO_TO_STR(PERSISTENT_CLASS) ) -#endif // NL_OS_WINDOWS +//#pragma message( "Using token family "NL_MACRO_TO_STR(PERSISTENT_TOKEN_FAMILY)" for persistent data class " NL_MACRO_TO_STR(PERSISTENT_CLASS) ) // setup some macros for constructing the classname and object name that we need for // the 'persistent token family' constants class diff --git a/code/ryzom/common/src/game_share/type_skill_mod.cpp b/code/ryzom/common/src/game_share/type_skill_mod.cpp index 2a740ab31..c545b4705 100644 --- a/code/ryzom/common/src/game_share/type_skill_mod.cpp +++ b/code/ryzom/common/src/game_share/type_skill_mod.cpp @@ -43,8 +43,6 @@ PROP(sint32, Modifier)\ PROP2(Type, std::string, EGSPD::CClassificationType::toString(Type), Type=EGSPD::CClassificationType::fromString(val))\ -#ifdef NL_OS_WINDOWS - #pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS + //#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "persistent_data_template.h" \ No newline at end of file diff --git a/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp b/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp index 7be61f6af..6591dc3fe 100644 --- a/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp +++ b/code/ryzom/server/src/ai_service/ai_script_data_manager.cpp @@ -59,7 +59,7 @@ using namespace NLNET; } \ } \ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -82,7 +82,7 @@ using namespace NLNET; nldebug("Var '%s' = '%s'", first->first.c_str(), first->second.c_str()); \ } \ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/game_event_manager.cpp b/code/ryzom/server/src/entities_game_service/game_event_manager.cpp index 4d20608a7..7e45e6a16 100644 --- a/code/ryzom/server/src/entities_game_service/game_event_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/game_event_manager.cpp @@ -332,6 +332,6 @@ void CGameEventManager::saveGameEventFile() PROP(string, _EventFaction1ChannelName)\ PROP(string, _EventFaction2ChannelName)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp index 013c7b666..a2ee14d2e 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp @@ -4878,7 +4878,8 @@ NLMISC_COMMAND(testParanoidItemSystem,"run some test code that should provoke a //----------------------------------------------- std::string CGameItem::showItemsStats() { -#pragma message(NL_LOC_MSG "Implement me") +//#pragma message(NL_LOC_MSG "Implement me") + // TODO: implement this return ""; // NLMISC::CSheetId stackSheet=NLMISC::CSheetId("stack.sitem"); diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp index bd9abe554..5b2dd3eaf 100644 --- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp +++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp @@ -1164,7 +1164,7 @@ NLMISC_COMMAND(dumpPlayerInventories, "dump inventories of the player (DEBUG)", }\ )\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" // **************************************************************************** diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp index 65ec7f175..cfadf3967 100644 --- a/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp +++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp @@ -2036,7 +2036,7 @@ private: FLAG0(CLEAR, clear())\ LSTRUCT_VECT(Child, if (0), ;/* do not store in old format anymore */, loadItem(pdr)) -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -2070,6 +2070,6 @@ private: PROP2(DeclaredCiv,string,PVP_CLAN::toString(_DeclaredCiv),_DeclaredCiv=PVP_CLAN::fromString(val))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue.cpp index 54e7eb79f..6b3414dd2 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue.cpp +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue.cpp @@ -848,7 +848,7 @@ void CMissionQueue::dump() PROP(uint32, LastConnectionDate)\ PROP(bool, Awake)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -876,5 +876,5 @@ void CMissionQueue::dump() STRUCT_LIST(CWaitingEntity,_Entities)\ PROP_VECT(CEntityId, _PlayersToRollBackInSteps)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp index 3c2540c64..83186f292 100644 --- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp +++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp @@ -378,7 +378,7 @@ void CMissionQueueManager::dump() #define PERSISTENT_DATA\ PROP_VECT(uint32, QueueIds)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -399,6 +399,6 @@ void CMissionQueueManager::dump() STRUCT_MAP(CEntityId, CQueueVect, _PlayerQueues)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp index 2ca3a5d70..07b098793 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp @@ -3195,6 +3195,6 @@ std::string COutpost::toString() const }\ )\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_building.cpp b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_building.cpp index f8ea6221d..7567c3d92 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_building.cpp +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_building.cpp @@ -341,6 +341,6 @@ void COutpostBuilding::postLoad() PROP(float, _MPLeft)\ PROP(uint32, _MPLastTime)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.cpp b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.cpp index 7fc4db499..6b489ba62 100644 --- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.cpp +++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.cpp @@ -589,7 +589,7 @@ std::string COutpostSquadData::toString() const PROP(CSheetId,_Sheet)\ PROP(TAIAlias,_Alias)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" ////////////////////////////////////////////////////////////////////////////// @@ -605,6 +605,6 @@ std::string COutpostSquadData::toString() const STRUCT2(_Desc,_Desc.store(pdr),_Desc.apply(pdr))\ PROP(TAIAlias,_SpawnZone)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/chg_charac_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/chg_charac_effect.cpp index bb5ddffbf..70e7d4d79 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/chg_charac_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/chg_charac_effect.cpp @@ -130,5 +130,5 @@ void CChgCharacEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/enchant_weapon_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/enchant_weapon_effect.cpp index acd1af37c..081b25c9d 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/enchant_weapon_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/enchant_weapon_effect.cpp @@ -162,5 +162,5 @@ void CEnchantWeaponEffect::activate() PROP2(_DamageType, string, DMGTYPE::toString(_DamageType), _DamageType = DMGTYPE::stringToDamageType(val))\ PROP(bool,_EndsAtCasterDeath)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_craft_success_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_craft_success_effect.cpp index 1fafbd042..d92f4687f 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_craft_success_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_craft_success_effect.cpp @@ -113,6 +113,6 @@ void CModCraftSuccessEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_defense_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_defense_effect.cpp index 0d4fbd103..fbe646aa9 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_defense_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_defense_effect.cpp @@ -151,5 +151,5 @@ void CModDefenseEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_forage_success_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_forage_success_effect.cpp index 17a7f9b5c..fb6d51e5c 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_forage_success_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_forage_success_effect.cpp @@ -119,6 +119,6 @@ void CModForageSuccessEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_protection_effet.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_protection_effet.cpp index a49c2499d..d6fd6851c 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_protection_effet.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_protection_effet.cpp @@ -106,5 +106,5 @@ void CModMagicProtectionEffect::activate() PROP(sint32,_Modifier1)\ PROP(sint32,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_success_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_success_effect.cpp index 4f50a99cf..a8bef8179 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_success_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_success_effect.cpp @@ -113,6 +113,6 @@ void CModMagicSuccessEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_melee_success_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_melee_success_effect.cpp index f83567690..b45df45fc 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_melee_success_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_melee_success_effect.cpp @@ -113,6 +113,6 @@ void CModMeleeSuccessEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_range_success_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_range_success_effect.cpp index 96b55c9ba..0f4d8d382 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/mod_range_success_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/mod_range_success_effect.cpp @@ -113,6 +113,6 @@ void CModRangeSuccessEffect::activate() PROP(float,_Modifier1)\ PROP(float,_Modifier2)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/power_shielding_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/power_shielding_effect.cpp index 51b758db4..4759b3aab 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/power_shielding_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/power_shielding_effect.cpp @@ -137,5 +137,5 @@ void CShieldingEffect::activate() PROP(uint16,_BucklerMaxProtection)\ PROP(uint16,_ShieldMaxProtection)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.cpp index 42fa47559..a46abe239 100644 --- a/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.cpp @@ -305,7 +305,7 @@ void CSEffect::sendEffectEndMessages() PROP(bool,_IsStackable)\ PROP(bool,_IsRemoved)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -318,5 +318,5 @@ void CSEffect::sendEffectEndMessages() STRUCT2(SEffect, CSEffect::store(pdr), CSEffect::apply(pdr))\ PROP2(_EndDate, TGameCycle, _EndDate>CTickEventHandler::getGameCycle()?_EndDate-CTickEventHandler::getGameCycle():(TGameCycle)0, _EndDate=val)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_name_extraction.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_name_extraction.cpp index 294468e06..0662b04f9 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_name_extraction.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_name_extraction.cpp @@ -30,7 +30,7 @@ using namespace NLMISC; #define PERSISTENT_DATA\ PROP(string,Name)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" #undef PERSISTENT_CLASS @@ -42,7 +42,7 @@ using namespace NLMISC; #define PERSISTENT_DATA\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" #undef PERSISTENT_CLASS diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_statistics_recorder.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_statistics_recorder.cpp index 07cba72c4..7e1f0cb1e 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/character_statistics_recorder.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/character_statistics_recorder.cpp @@ -86,7 +86,7 @@ void CCharaterStatisticsRecorderRecord::build(const CCharaterStatisticsRecorderR PROP_GAME_CYCLE_COMP(_TicksInGame)\ PROP(sint32,_TotalXP)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -145,7 +145,7 @@ void CCharaterStatisticsRecorderContainer::add(CCharacter* character) STRUCT_INDEXED_VECT(_Sessions10)\ STRUCT_INDEXED_VECT(_Sessions100)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/player_manager/persistent_effect.cpp b/code/ryzom/server/src/entities_game_service/player_manager/persistent_effect.cpp index 45b562d55..062440dce 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/persistent_effect.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/persistent_effect.cpp @@ -211,5 +211,5 @@ void CPersistentEffect::readPdr(CPersistentDataRecord& pdr) #define PERSISTENT_DATA\ LSTRUCT_VECT(_PersistentEffects, VECT_LOGIC(_PersistentEffects), writePdr(_PersistentEffects[i], pdr), readPdr(pdr))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp b/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp index 7a1684432..542135aa9 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp @@ -130,7 +130,7 @@ public: PROP2(FameMemory,sint32,target.getFameMemory(),target.setFameMemory(val))\ PROP2(LastFameChangeTrend,string,CFameTrend::toString(target.getLastFameChangeTrend()),target.setLastFameChangeTrend(CFameTrend::fromString(val)))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -163,7 +163,7 @@ public: CFameContainerEntryProxy().store(pdr,(*it).second),\ CFameContainerEntryProxy().apply(pdr,*target.addToEntries(key)))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -257,7 +257,7 @@ private: _Inventory->getItem(i)->store(pdr),\ loadItem(pdr))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -568,7 +568,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP2(GodMode, bool, getGodModeSave(), setGodModeSave(val)) \ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -626,7 +626,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons NPROP(WeaponQualityModifier,sint32,_SpecialModifiers.WeaponQualityModifier)\ NPROP(ArmorAbsorbtionMultiplier,sint32,_SpecialModifiers.ArmorAbsorbtionMultiplier)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -689,7 +689,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(bool,IsTpAllowed)\ PROP(TSatiety,Satiety)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -705,7 +705,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(uint8,PactNature)\ PROP(uint8,PactType)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -724,7 +724,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons FLAG0(CLEAR,clear())\ STRUCT_VECT(_AuraActivationDates)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -741,7 +741,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(uint16, ConsumableFamilyId)\ PROP2(PowerType,string,POWERS::toString(PowerType),PowerType=POWERS::toPowerType(val))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -759,7 +759,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons FLAG0(CLEAR,clear())\ STRUCT_VECT(PowerActivationDates)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -772,7 +772,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons LPROP2(ActivationDate, NLMISC::TGameCycle, if(ActivationDate >= CTickEventHandler::getGameCycle()), ActivationDate - CTickEventHandler::getGameCycle(), ActivationDate = val)\ PROP2(Family,string, CConsumable::getFamilyName(Family), Family=CConsumable::getFamilyIndex(val))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -788,7 +788,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons FLAG0(CLEAR,clear())\ STRUCT_VECT(Dates) -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -812,7 +812,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons _MemSets[i]->store(pdr),\ if (key<_MemSets.size()) getMemSet(key)->apply(pdr))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -836,7 +836,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons Phrases[key]->apply(pdr);\ })\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -852,7 +852,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP_VECT(CSheetId,Bricks)\ PROP(uint16,PhraseId)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -868,7 +868,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons STRUCT(PhraseDesc)\ PROP(CSheetId,PhraseSheetId)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -884,7 +884,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(bool, Successfull)\ PROP_GAME_CYCLE_COMP(LastSuccessDate)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -899,7 +899,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(TAIAlias, MissionAlias)\ PROP(TAIAlias, BotAlias)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -917,7 +917,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(double,_DeathXPToGain)\ PROP(uint32,_BonusUpdateTime)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -935,7 +935,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(sint32,Z)\ PROP(float,Heading)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -953,7 +953,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP(sint32,Z)\ PROP(float,Heading)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -967,7 +967,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons PROP2(SessionId,uint32,SessionId.asInt(),SessionId=TSessionId(val))\ STRUCT(PosState)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -980,7 +980,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons #define PERSISTENT_DATA\ STRUCT_VECT(_Vec)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1017,7 +1017,7 @@ static void displayWarning(const std::string& s) if (k!=CHARACTERISTICS::Unknown) { _PhysicalCharacteristics[k].Base=val; _PhysicalCharacteristics[k].Current=val; _PhysicalCharacteristics[k].Max=val; displayInfo(string()+"Setting "+key+": "+toString(val)); }\ else displayWarning(string()+"Failed to set "+key+": "+toString(val)) ) -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1046,7 +1046,7 @@ static void displayWarning(const std::string& s) _PhysicalScores[i].store(pdr),\ SCORES::TScores k=SCORES::toScore(key); if (k!=SCORES::unknown) _PhysicalScores[k].apply(pdr))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1066,7 +1066,7 @@ static void displayWarning(const std::string& s) LPROP(float,BaseRegenerateAction,if (BaseRegenerateRepos!=0.0f))\ LPROP(float,CurrentRegenerate,if (BaseRegenerateRepos!=0.0f))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1092,7 +1092,7 @@ static void displayWarning(const std::string& s) _Skills[i].store(pdr),\ SKILLS::ESkills k=SKILLS::toSkill(key); if (k!=SKILLS::unknown) _Skills[k].apply(pdr))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1112,7 +1112,7 @@ static void displayWarning(const std::string& s) PROP(double,Xp)\ PROP(double,XpNextLvl)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1128,7 +1128,7 @@ static void displayWarning(const std::string& s) PROP2(Name,string,Name.toUtf8(),Name.fromUtf8(val))\ PROP_VECT(CSheetId,Bricks)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1155,7 +1155,7 @@ static void displayWarning(const std::string& s) Malus[i].store(pdr),\ if (keystore(pdr), Inventory->apply(pdr, NULL))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1346,7 +1346,7 @@ private: LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\ PROP2(_CustomText, ucstring, _CustomText, _CustomText=val)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1406,7 +1406,7 @@ private: LPROP(float,JungleResistanceFactor,if (Protection3Factor!=0.0f))\ LPROP(float,PrimaryRootResistanceFactor,if (Protection3Factor!=0.0f))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1462,7 +1462,7 @@ private: )\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -1497,7 +1497,7 @@ private: )\ PROP(bool, _HideOthers)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1525,7 +1525,7 @@ private: #define PERSISTENT_DATA\ STRUCT_VECT(_EncyCharAlbums)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -1538,7 +1538,7 @@ private: PROP(uint8,AlbumState)\ STRUCT_VECT(Themas)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -1552,7 +1552,7 @@ private: PROP(uint8,ThemaState)\ PROP(uint16,RiteTaskStatePacked)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" //----------------------------------------------------------------------------- @@ -1566,7 +1566,7 @@ private: PROP(uint32,Duration)\ PROP(uint32,LogoffTime)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" @@ -1590,7 +1590,7 @@ private: PROP_GAME_CYCLE_COMP(_Date)\ LPROP2(_EventFaction, string, if (!_EventFaction.empty()), _EventFaction, setEventFaction(val))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/player_manager/ring_reward_points.cpp b/code/ryzom/server/src/entities_game_service/player_manager/ring_reward_points.cpp index 51fa02d4c..bad90dae2 100644 --- a/code/ryzom/server/src/entities_game_service/player_manager/ring_reward_points.cpp +++ b/code/ryzom/server/src/entities_game_service/player_manager/ring_reward_points.cpp @@ -588,11 +588,13 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R } // in any case, generate a mission event -#pragma message (NL_LOC_WRN "give the correct scenario tag") +//#pragma message (NL_LOC_WRN "give the correct scenario tag") + // TODO: give the correct scenario tag CMissionEventTaggedRingScenarioDone event("blabla"); _ParentCharacter->processMissionEvent(event); -#pragma message (NL_LOC_WRN "Implements 'rare' item reward generation") +//#pragma message (NL_LOC_WRN "Implements 'rare' item reward generation") + // TODO: Implements 'rare' item reward generation // make sure the reward level is valid BOMB_IF(rewardLevel>R2::TSessionLevel::last_enum_item,"Ignoring attempting to generate reward of invalid level for character "<<_ParentCharacter->getId().toString(),return CRingRewardPoints::grr_invalid); @@ -613,8 +615,10 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R */ /* *** todo *** */ -#pragma message (NL_LOC_WRN "Implements mission step validation") -#pragma message (NL_LOC_WRN "Implements 'rare' item reward generation") +//#pragma message (NL_LOC_WRN "Implements mission step validation") +//#pragma message (NL_LOC_WRN "Implements 'rare' item reward generation") + // TODO: Implements mission step validation and 'rare' item reward generation + // NB : need to return grr_ok_rare if rare item were gained // calculate the reward points of this level that the player has @@ -683,7 +687,8 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R /* This is where we add some code to validate the mission step if player is in newbyland and has the 'complete a ring scenario' mission */ -#pragma message (NL_LOC_WRN "Implements mission step validation") +//#pragma message (NL_LOC_WRN "Implements mission step validation") + // TODO: Implements mission step validation /* *** todo *** */ // some handy temporaries @@ -775,8 +780,9 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R return CRingRewardPoints::grr_no_place; } - // NB : need to return grr_ok_rare if rare item were gained -#pragma message (NL_LOC_WRN "Implements 'rare' item reward generation") + // NB : need to return grr_ok_rare if rare item were gained +//#pragma message (NL_LOC_WRN "Implements 'rare' item reward generation") + // TODO: Implements 'rare' item reward generation } LOG("RRP generateReward(%s): %s: - SUCCESS", rewardLevel.toString().c_str(), _ParentCharacter->getId().toString().c_str()); @@ -807,5 +813,5 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R _HistoricRRP[i],\ if (key.size()==6) { uint32 idx=(key[5]-'A'); if (idx EGSLight; }\ )\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" #undef PERSISTENT_DATA diff --git a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp index 179f0c98c..f44e8dd84 100644 --- a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp +++ b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp @@ -180,7 +180,7 @@ void CTradeBase::copy( IItemTrade * itt ) CGameItem::CPersistentApplyArg applyArgs;\ _ItemPtr->apply(pdr, applyArgs))\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/entities_game_service/shop_type/items_for_sale.cpp b/code/ryzom/server/src/entities_game_service/shop_type/items_for_sale.cpp index a7586a2ed..72aee612c 100644 --- a/code/ryzom/server/src/entities_game_service/shop_type/items_for_sale.cpp +++ b/code/ryzom/server/src/entities_game_service/shop_type/items_for_sale.cpp @@ -349,6 +349,6 @@ NLMISC_COMMAND(deleteItemsForSale, "delete items for sale of a player on the giv }\ )\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/server/src/frontend_service/client_host.cpp b/code/ryzom/server/src/frontend_service/client_host.cpp index 86bba619f..ad13435ed 100644 --- a/code/ryzom/server/src/frontend_service/client_host.cpp +++ b/code/ryzom/server/src/frontend_service/client_host.cpp @@ -32,9 +32,9 @@ using namespace CLFECOMMON; #ifdef HALF_FREQUENCY_SENDING_TO_CLIENT -#pragma message ("HALF_FREQUENCY_SENDING_TO_CLIENT") +//#pragma message ("HALF_FREQUENCY_SENDING_TO_CLIENT") #else -#pragma message ("FULL_FREQUENCY_SENDING_TO_CLIENT") +//#pragma message ("FULL_FREQUENCY_SENDING_TO_CLIENT") #endif diff --git a/code/ryzom/server/src/frontend_service/uid_impulsions.cpp b/code/ryzom/server/src/frontend_service/uid_impulsions.cpp index e03e3b705..97b8b2b1d 100644 --- a/code/ryzom/server/src/frontend_service/uid_impulsions.cpp +++ b/code/ryzom/server/src/frontend_service/uid_impulsions.cpp @@ -64,7 +64,7 @@ static void impulsionSelectChar(uint32 uid, NLMISC::CBitMemStream &bms, NLMISC:: } // TODO : ring : add character/role checking -#pragma message (NL_LOC_MSG "Ring TODO : add R2 character/role checking") +//#pragma message (NL_LOC_MSG "Ring TODO : add R2 character/role checking") // Check authorized character slot if (((ch->AuthorizedCharSlot != 0xF) && (selectCharMsg.c != ch->AuthorizedCharSlot)) && diff --git a/code/ryzom/server/src/server_share/stat_db_tree_pd.cpp b/code/ryzom/server/src/server_share/stat_db_tree_pd.cpp index 8b290f0f1..ac446824b 100644 --- a/code/ryzom/server/src/server_share/stat_db_tree_pd.cpp +++ b/code/ryzom/server/src/server_share/stat_db_tree_pd.cpp @@ -35,7 +35,7 @@ using namespace NLMISC; PROP(string,Path)\ PROP(sint32,Value)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" // **************************************************************************** @@ -46,7 +46,7 @@ using namespace NLMISC; PROP_MAP(CEntityId,sint32,PlayerValues)\ PROP_MAP(EGSPD::TGuildId,sint32,GuildValues)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" // **************************************************************************** @@ -55,5 +55,5 @@ using namespace NLMISC; #define PERSISTENT_DATA\ STRUCT_VECT(ValueLeavesPD)\ -#pragma message( PERSISTENT_GENERATION_MESSAGE ) +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" diff --git a/code/ryzom/tools/patch_gen/patch_gen_common.cpp b/code/ryzom/tools/patch_gen/patch_gen_common.cpp index f4d856be1..a446c9d7f 100644 --- a/code/ryzom/tools/patch_gen/patch_gen_common.cpp +++ b/code/ryzom/tools/patch_gen/patch_gen_common.cpp @@ -489,9 +489,7 @@ uint32 CPackageDescription::getPackageVersionNumber() PROP(std::string,_RefDirectory)\ PROP(std::string,_NextVersionFile)\ -#ifdef NL_OS_WINDOWS -#pragma message( PERSISTENT_GENERATION_MESSAGE ) -#endif // NL_OS_WINDOWS +//#pragma message( PERSISTENT_GENERATION_MESSAGE ) #include "game_share/persistent_data_template.h" #undef PERSISTENT_CLASS