aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-20 16:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: #825 Commented out all #pragma message

Browse source
This commit is contained in:
kervala 2010-09-25 18:12:37 +02:00
parent 0c750706c8
commit 123c773bae
41 changed files with 115 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/far_tp.cpp
View file

@ -751,9 +751,7 @@ retryJoinEdit:
throw "Protocol error"; throw "Protocol error";
if (sb._LastJoinSessionResult == 16) if (sb._LastJoinSessionResult == 16)
{ {
#ifdef NL_OS_WINDOWS // #pragma message (NL_LOC_WRN "inform the player that he is banned from the ring")
#pragma message (NL_LOC_WRN "inform the player that he is banned from the ring")
#endif // NL_OS_WINDOWS
throw "User ban from the ring"; throw "User ban from the ring";
} }
if (sb._LastJoinSessionResult != 0) if (sb._LastJoinSessionResult != 0)

4
code/ryzom/client/src/property_decoder.cpp
View file

@ -50,7 +50,7 @@ void CPropertyDecoder::receive(TPacketNumber /* packetNumber */, CAction *action
CPropertyEntry &pz = _Entities[act->Slot].Properties[PROPERTY_POSZ]; CPropertyEntry &pz = _Entities[act->Slot].Properties[PROPERTY_POSZ];
*/ */
#ifdef TEST_POSITION_CORRECTNESS #ifdef TEST_POSITION_CORRECTNESS
#pragma message ("TEST_POSITION_CORRECTNESS") //#pragma message ("TEST_POSITION_CORRECTNESS")
TCoord posx = (TCoord)(act->Position[0]); TCoord posx = (TCoord)(act->Position[0]);
TCoord posy = (TCoord)(act->Position[1]); TCoord posy = (TCoord)(act->Position[1]);
#endif #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); //nldebug("CLPROPD: Received position (Id=%d) %d,%d (Pck=%d)", act->CLEntityId, act->Position[0], act->Position[1], packetNumber);
*/ */
#ifdef TEST_POSITION_CORRECTNESS #ifdef TEST_POSITION_CORRECTNESS
#pragma message ("TEST_POSITION_CORRECTNESS") //#pragma message ("TEST_POSITION_CORRECTNESS")
if ( ! (act->IsRelative) ) if ( ! (act->IsRelative) )
{ {
// Check if the compression algo for positions worked // Check if the compression algo for positions worked

4
code/ryzom/common/src/game_share/action_position.cpp
View file

@ -71,7 +71,7 @@ void CActionPosition::unpack (NLMISC::CBitMemStream &message)
Interior = (Position16[2] & (uint16)0x2)!=0; Interior = (Position16[2] & (uint16)0x2)!=0;
#ifdef TEST_POSITION_CORRECTNESS #ifdef TEST_POSITION_CORRECTNESS
#pragma message (NL_LOC_MSG "TEST_POSITION_CORRECTNESS") //#pragma message (NL_LOC_MSG "TEST_POSITION_CORRECTNESS")
TCoord px, py; TCoord px, py;
message.serialAndLog1( px ); message.serialAndLog1( px );
message.serialAndLog1( py ); message.serialAndLog1( py );
@ -138,7 +138,7 @@ void CActionPosition::pack (NLMISC::CBitMemStream &message)
message.serialAndLog1( posz16 ); message.serialAndLog1( posz16 );
#ifdef TEST_POSITION_CORRECTNESS #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 px = Position[0];
TCoord py = Position[1]; TCoord py = Position[1];
message.serialAndLog1( px ); message.serialAndLog1( px );

24
code/ryzom/common/src/game_share/bnp_patch.cpp
View file

@ -183,9 +183,7 @@ bool CBNPFileVersion::operator!=(const CBNPFileVersion& other) const
PROP(uint32,_PatchSize) \ PROP(uint32,_PatchSize) \
PROP_VECT(uint32,_HashKey) PROP_VECT(uint32,_HashKey)
#ifdef NL_OS_WINDOWS //# pragma message( PERSISTENT_GENERATION_MESSAGE )
# pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS
@ -335,9 +333,7 @@ bool CBNPFile::isIncremental()
PROP(std::string,_FileName)\ PROP(std::string,_FileName)\
STRUCT_VECT(_Versions) STRUCT_VECT(_Versions)
#ifdef NL_OS_WINDOWS //# pragma message( PERSISTENT_GENERATION_MESSAGE )
# pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS
@ -450,9 +446,7 @@ void CBNPFileSet::addFile(const std::string& fileName,bool isIncremental)
#define PERSISTENT_CLASS CBNPFileSet #define PERSISTENT_CLASS CBNPFileSet
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
STRUCT_VECT(_Files) STRUCT_VECT(_Files)
#ifdef NL_OS_WINDOWS //# pragma message( PERSISTENT_GENERATION_MESSAGE )
# pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS
@ -572,9 +566,7 @@ void CBNPCategory::addFile(const std::string& fileName)
LPROP(bool, _Hidden, if(_Hidden))\ LPROP(bool, _Hidden, if(_Hidden))\
PROP_VECT(std::string, _Files)\ PROP_VECT(std::string, _Files)\
#ifdef NL_OS_WINDOWS //# pragma message( PERSISTENT_GENERATION_MESSAGE )
# pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS
@ -724,9 +716,7 @@ bool CBNPCategorySet::isFileIncremental(const std::string& fileName) const
#define PERSISTENT_CLASS CBNPCategorySet #define PERSISTENT_CLASS CBNPCategorySet
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
STRUCT_VECT(_Category) STRUCT_VECT(_Category)
#ifdef NL_OS_WINDOWS //# pragma message( PERSISTENT_GENERATION_MESSAGE )
# pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS
@ -815,9 +805,7 @@ void CProductDescriptionForClient::serial(NLMISC::IStream &f)
STRUCT(_Files)\ STRUCT(_Files)\
STRUCT(_Categories) STRUCT(_Categories)
#ifdef NL_OS_WINDOWS //# pragma message( PERSISTENT_GENERATION_MESSAGE )
# pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif //NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS

4
code/ryzom/common/src/game_share/persistent_data_template.h
View file

@ -219,9 +219,7 @@ inline NLMISC::TGameCycle loadSecondToGameCycle(uint32 second)
#ifdef PERSISTENT_TOKEN_FAMILY #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) )
#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
// setup some macros for constructing the classname and object name that we need for // setup some macros for constructing the classname and object name that we need for
// the 'persistent token family' constants class // the 'persistent token family' constants class

4
code/ryzom/common/src/game_share/type_skill_mod.cpp
View file

@ -43,8 +43,6 @@
PROP(sint32, Modifier)\ PROP(sint32, Modifier)\
PROP2(Type, std::string, EGSPD::CClassificationType::toString(Type), Type=EGSPD::CClassificationType::fromString(val))\ PROP2(Type, std::string, EGSPD::CClassificationType::toString(Type), Type=EGSPD::CClassificationType::fromString(val))\
#ifdef NL_OS_WINDOWS //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "persistent_data_template.h" #include "persistent_data_template.h"

4
code/ryzom/server/src/ai_service/ai_script_data_manager.cpp
View file

@ -59,7 +59,7 @@ using namespace NLNET;
} \ } \
} \ } \
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #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()); \ 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" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/game_event_manager.cpp
View file

@ -332,6 +332,6 @@ void CGameEventManager::saveGameEventFile()
PROP(string, _EventFaction1ChannelName)\ PROP(string, _EventFaction1ChannelName)\
PROP(string, _EventFaction2ChannelName)\ PROP(string, _EventFaction2ChannelName)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

3
code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
View file

@ -4878,7 +4878,8 @@ NLMISC_COMMAND(testParanoidItemSystem,"run some test code that should provoke a
//----------------------------------------------- //-----------------------------------------------
std::string CGameItem::showItemsStats() std::string CGameItem::showItemsStats()
{ {
#pragma message(NL_LOC_MSG "Implement me") //#pragma message(NL_LOC_MSG "Implement me")
// TODO: implement this
return ""; return "";
// NLMISC::CSheetId stackSheet=NLMISC::CSheetId("stack.sitem"); // NLMISC::CSheetId stackSheet=NLMISC::CSheetId("stack.sitem");

2
code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
View file

@ -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" #include "game_share/persistent_data_template.h"
// **************************************************************************** // ****************************************************************************

4
code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
View file

@ -2036,7 +2036,7 @@ private:
FLAG0(CLEAR, clear())\ FLAG0(CLEAR, clear())\
LSTRUCT_VECT(Child, if (0), ;/* do not store in old format anymore */, loadItem(pdr)) 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" #include "game_share/persistent_data_template.h"
@ -2070,6 +2070,6 @@ private:
PROP2(DeclaredCiv,string,PVP_CLAN::toString(_DeclaredCiv),_DeclaredCiv=PVP_CLAN::fromString(val))\ 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" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/entities_game_service/mission_manager/mission_queue.cpp
View file

@ -848,7 +848,7 @@ void CMissionQueue::dump()
PROP(uint32, LastConnectionDate)\ PROP(uint32, LastConnectionDate)\
PROP(bool, Awake)\ PROP(bool, Awake)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -876,5 +876,5 @@ void CMissionQueue::dump()
STRUCT_LIST(CWaitingEntity,_Entities)\ STRUCT_LIST(CWaitingEntity,_Entities)\
PROP_VECT(CEntityId, _PlayersToRollBackInSteps)\ PROP_VECT(CEntityId, _PlayersToRollBackInSteps)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/entities_game_service/mission_manager/mission_queue_manager.cpp
View file

@ -378,7 +378,7 @@ void CMissionQueueManager::dump()
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
PROP_VECT(uint32, QueueIds)\ PROP_VECT(uint32, QueueIds)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -399,6 +399,6 @@ void CMissionQueueManager::dump()
STRUCT_MAP(CEntityId, CQueueVect, _PlayerQueues)\ STRUCT_MAP(CEntityId, CQueueVect, _PlayerQueues)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
View file

@ -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" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/outpost_manager/outpost_building.cpp
View file

@ -341,6 +341,6 @@ void COutpostBuilding::postLoad()
PROP(float, _MPLeft)\ PROP(float, _MPLeft)\
PROP(uint32, _MPLastTime)\ PROP(uint32, _MPLastTime)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/entities_game_service/outpost_manager/outpost_squad.cpp
View file

@ -589,7 +589,7 @@ std::string COutpostSquadData::toString() const
PROP(CSheetId,_Sheet)\ PROP(CSheetId,_Sheet)\
PROP(TAIAlias,_Alias)\ PROP(TAIAlias,_Alias)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -605,6 +605,6 @@ std::string COutpostSquadData::toString() const
STRUCT2(_Desc,_Desc.store(pdr),_Desc.apply(pdr))\ STRUCT2(_Desc,_Desc.store(pdr),_Desc.apply(pdr))\
PROP(TAIAlias,_SpawnZone)\ PROP(TAIAlias,_SpawnZone)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/chg_charac_effect.cpp
View file

@ -130,5 +130,5 @@ void CChgCharacEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/enchant_weapon_effect.cpp
View file

@ -162,5 +162,5 @@ void CEnchantWeaponEffect::activate()
PROP2(_DamageType, string, DMGTYPE::toString(_DamageType), _DamageType = DMGTYPE::stringToDamageType(val))\ PROP2(_DamageType, string, DMGTYPE::toString(_DamageType), _DamageType = DMGTYPE::stringToDamageType(val))\
PROP(bool,_EndsAtCasterDeath)\ PROP(bool,_EndsAtCasterDeath)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_craft_success_effect.cpp
View file

@ -113,6 +113,6 @@ void CModCraftSuccessEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_defense_effect.cpp
View file

@ -151,5 +151,5 @@ void CModDefenseEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_forage_success_effect.cpp
View file

@ -119,6 +119,6 @@ void CModForageSuccessEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_protection_effet.cpp
View file

@ -106,5 +106,5 @@ void CModMagicProtectionEffect::activate()
PROP(sint32,_Modifier1)\ PROP(sint32,_Modifier1)\
PROP(sint32,_Modifier2)\ PROP(sint32,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_magic_success_effect.cpp
View file

@ -113,6 +113,6 @@ void CModMagicSuccessEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_melee_success_effect.cpp
View file

@ -113,6 +113,6 @@ void CModMeleeSuccessEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/mod_range_success_effect.cpp
View file

@ -113,6 +113,6 @@ void CModRangeSuccessEffect::activate()
PROP(float,_Modifier1)\ PROP(float,_Modifier1)\
PROP(float,_Modifier2)\ PROP(float,_Modifier2)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/phrase_manager/power_shielding_effect.cpp
View file

@ -137,5 +137,5 @@ void CShieldingEffect::activate()
PROP(uint16,_BucklerMaxProtection)\ PROP(uint16,_BucklerMaxProtection)\
PROP(uint16,_ShieldMaxProtection)\ PROP(uint16,_ShieldMaxProtection)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.cpp
View file

@ -305,7 +305,7 @@ void CSEffect::sendEffectEndMessages()
PROP(bool,_IsStackable)\ PROP(bool,_IsStackable)\
PROP(bool,_IsRemoved)\ PROP(bool,_IsRemoved)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -318,5 +318,5 @@ void CSEffect::sendEffectEndMessages()
STRUCT2(SEffect, CSEffect::store(pdr), CSEffect::apply(pdr))\ STRUCT2(SEffect, CSEffect::store(pdr), CSEffect::apply(pdr))\
PROP2(_EndDate, TGameCycle, _EndDate>CTickEventHandler::getGameCycle()?_EndDate-CTickEventHandler::getGameCycle():(TGameCycle)0, _EndDate=val)\ 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" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/entities_game_service/player_manager/character_name_extraction.cpp
View file

@ -30,7 +30,7 @@ using namespace NLMISC;
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
PROP(string,Name)\ PROP(string,Name)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS
@ -42,7 +42,7 @@ using namespace NLMISC;
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS

4
code/ryzom/server/src/entities_game_service/player_manager/character_statistics_recorder.cpp
View file

@ -86,7 +86,7 @@ void CCharaterStatisticsRecorderRecord::build(const CCharaterStatisticsRecorderR
PROP_GAME_CYCLE_COMP(_TicksInGame)\ PROP_GAME_CYCLE_COMP(_TicksInGame)\
PROP(sint32,_TotalXP)\ PROP(sint32,_TotalXP)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -145,7 +145,7 @@ void CCharaterStatisticsRecorderContainer::add(CCharacter* character)
STRUCT_INDEXED_VECT(_Sessions10)\ STRUCT_INDEXED_VECT(_Sessions10)\
STRUCT_INDEXED_VECT(_Sessions100)\ STRUCT_INDEXED_VECT(_Sessions100)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/player_manager/persistent_effect.cpp
View file

@ -211,5 +211,5 @@ void CPersistentEffect::readPdr(CPersistentDataRecord& pdr)
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
LSTRUCT_VECT(_PersistentEffects, VECT_LOGIC(_PersistentEffects), writePdr(_PersistentEffects[i], pdr), readPdr(pdr))\ 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" #include "game_share/persistent_data_template.h"

84
code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
View file

@ -130,7 +130,7 @@ public:
PROP2(FameMemory,sint32,target.getFameMemory(),target.setFameMemory(val))\ PROP2(FameMemory,sint32,target.getFameMemory(),target.setFameMemory(val))\
PROP2(LastFameChangeTrend,string,CFameTrend::toString(target.getLastFameChangeTrend()),target.setLastFameChangeTrend(CFameTrend::fromString(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" #include "game_share/persistent_data_template.h"
@ -163,7 +163,7 @@ public:
CFameContainerEntryProxy().store(pdr,(*it).second),\ CFameContainerEntryProxy().store(pdr,(*it).second),\
CFameContainerEntryProxy().apply(pdr,*target.addToEntries(key)))\ CFameContainerEntryProxy().apply(pdr,*target.addToEntries(key)))\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -257,7 +257,7 @@ private:
_Inventory->getItem(i)->store(pdr),\ _Inventory->getItem(i)->store(pdr),\
loadItem(pdr))\ loadItem(pdr))\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -568,7 +568,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP2(GodMode, bool, getGodModeSave(), setGodModeSave(val)) \ PROP2(GodMode, bool, getGodModeSave(), setGodModeSave(val)) \
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -626,7 +626,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
NPROP(WeaponQualityModifier,sint32,_SpecialModifiers.WeaponQualityModifier)\ NPROP(WeaponQualityModifier,sint32,_SpecialModifiers.WeaponQualityModifier)\
NPROP(ArmorAbsorbtionMultiplier,sint32,_SpecialModifiers.ArmorAbsorbtionMultiplier)\ NPROP(ArmorAbsorbtionMultiplier,sint32,_SpecialModifiers.ArmorAbsorbtionMultiplier)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -689,7 +689,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(bool,IsTpAllowed)\ PROP(bool,IsTpAllowed)\
PROP(TSatiety,Satiety)\ PROP(TSatiety,Satiety)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -705,7 +705,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(uint8,PactNature)\ PROP(uint8,PactNature)\
PROP(uint8,PactType)\ PROP(uint8,PactType)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -724,7 +724,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
FLAG0(CLEAR,clear())\ FLAG0(CLEAR,clear())\
STRUCT_VECT(_AuraActivationDates)\ STRUCT_VECT(_AuraActivationDates)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -741,7 +741,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(uint16, ConsumableFamilyId)\ PROP(uint16, ConsumableFamilyId)\
PROP2(PowerType,string,POWERS::toString(PowerType),PowerType=POWERS::toPowerType(val))\ 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" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -759,7 +759,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
FLAG0(CLEAR,clear())\ FLAG0(CLEAR,clear())\
STRUCT_VECT(PowerActivationDates)\ STRUCT_VECT(PowerActivationDates)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #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)\ LPROP2(ActivationDate, NLMISC::TGameCycle, if(ActivationDate >= CTickEventHandler::getGameCycle()), ActivationDate - CTickEventHandler::getGameCycle(), ActivationDate = val)\
PROP2(Family,string, CConsumable::getFamilyName(Family), Family=CConsumable::getFamilyIndex(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" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -788,7 +788,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
FLAG0(CLEAR,clear())\ FLAG0(CLEAR,clear())\
STRUCT_VECT(Dates) STRUCT_VECT(Dates)
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -812,7 +812,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
_MemSets[i]->store(pdr),\ _MemSets[i]->store(pdr),\
if (key<_MemSets.size()) getMemSet(key)->apply(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" #include "game_share/persistent_data_template.h"
@ -836,7 +836,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
Phrases[key]->apply(pdr);\ Phrases[key]->apply(pdr);\
})\ })\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -852,7 +852,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP_VECT(CSheetId,Bricks)\ PROP_VECT(CSheetId,Bricks)\
PROP(uint16,PhraseId)\ PROP(uint16,PhraseId)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -868,7 +868,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
STRUCT(PhraseDesc)\ STRUCT(PhraseDesc)\
PROP(CSheetId,PhraseSheetId)\ PROP(CSheetId,PhraseSheetId)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -884,7 +884,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(bool, Successfull)\ PROP(bool, Successfull)\
PROP_GAME_CYCLE_COMP(LastSuccessDate)\ PROP_GAME_CYCLE_COMP(LastSuccessDate)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -899,7 +899,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(TAIAlias, MissionAlias)\ PROP(TAIAlias, MissionAlias)\
PROP(TAIAlias, BotAlias)\ PROP(TAIAlias, BotAlias)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -917,7 +917,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(double,_DeathXPToGain)\ PROP(double,_DeathXPToGain)\
PROP(uint32,_BonusUpdateTime)\ PROP(uint32,_BonusUpdateTime)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -935,7 +935,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(sint32,Z)\ PROP(sint32,Z)\
PROP(float,Heading)\ PROP(float,Heading)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -953,7 +953,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
PROP(sint32,Z)\ PROP(sint32,Z)\
PROP(float,Heading)\ PROP(float,Heading)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #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))\ PROP2(SessionId,uint32,SessionId.asInt(),SessionId=TSessionId(val))\
STRUCT(PosState)\ STRUCT(PosState)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -980,7 +980,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
STRUCT_VECT(_Vec)\ STRUCT_VECT(_Vec)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #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)); }\ 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)) ) 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" #include "game_share/persistent_data_template.h"
@ -1046,7 +1046,7 @@ static void displayWarning(const std::string& s)
_PhysicalScores[i].store(pdr),\ _PhysicalScores[i].store(pdr),\
SCORES::TScores k=SCORES::toScore(key); if (k!=SCORES::unknown) _PhysicalScores[k].apply(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" #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,BaseRegenerateAction,if (BaseRegenerateRepos!=0.0f))\
LPROP(float,CurrentRegenerate,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" #include "game_share/persistent_data_template.h"
@ -1092,7 +1092,7 @@ static void displayWarning(const std::string& s)
_Skills[i].store(pdr),\ _Skills[i].store(pdr),\
SKILLS::ESkills k=SKILLS::toSkill(key); if (k!=SKILLS::unknown) _Skills[k].apply(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" #include "game_share/persistent_data_template.h"
@ -1112,7 +1112,7 @@ static void displayWarning(const std::string& s)
PROP(double,Xp)\ PROP(double,Xp)\
PROP(double,XpNextLvl)\ PROP(double,XpNextLvl)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #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))\ PROP2(Name,string,Name.toUtf8(),Name.fromUtf8(val))\
PROP_VECT(CSheetId,Bricks)\ PROP_VECT(CSheetId,Bricks)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1155,7 +1155,7 @@ static void displayWarning(const std::string& s)
Malus[i].store(pdr),\ Malus[i].store(pdr),\
if (key<Malus.size()) Malus[key].apply(pdr))\ if (key<Malus.size()) Malus[key].apply(pdr))\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1172,7 +1172,7 @@ static void displayWarning(const std::string& s)
PROP_GAME_CYCLE_COMP(ActivationDate)\ PROP_GAME_CYCLE_COMP(ActivationDate)\
PROP(bool,Disabled)\ PROP(bool,Disabled)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1245,7 +1245,7 @@ private:
FLAG0(CLEAR, clear())\ FLAG0(CLEAR, clear())\
LSTRUCT_VECT(Child, if (0), ;/* do not store in old format anymore */, loadItem(pdr)) 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" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1270,7 +1270,7 @@ private:
STRUCT2(Inventory, ;/* do not store in old format anymore */, COldPlayerRoomInventoryLoader(Inventory).apply(pdr))\ STRUCT2(Inventory, ;/* do not store in old format anymore */, COldPlayerRoomInventoryLoader(Inventory).apply(pdr))\
STRUCT2(RoomInventory, Inventory->store(pdr), Inventory->apply(pdr, NULL))\ STRUCT2(RoomInventory, Inventory->store(pdr), Inventory->apply(pdr, NULL))\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1346,7 +1346,7 @@ private:
LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\ LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\
PROP2(_CustomText, ucstring, _CustomText, _CustomText=val)\ PROP2(_CustomText, ucstring, _CustomText, _CustomText=val)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1406,7 +1406,7 @@ private:
LPROP(float,JungleResistanceFactor,if (Protection3Factor!=0.0f))\ LPROP(float,JungleResistanceFactor,if (Protection3Factor!=0.0f))\
LPROP(float,PrimaryRootResistanceFactor,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" #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" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1497,7 +1497,7 @@ private:
)\ )\
PROP(bool, _HideOthers)\ PROP(bool, _HideOthers)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1525,7 +1525,7 @@ private:
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
STRUCT_VECT(_EncyCharAlbums)\ STRUCT_VECT(_EncyCharAlbums)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1538,7 +1538,7 @@ private:
PROP(uint8,AlbumState)\ PROP(uint8,AlbumState)\
STRUCT_VECT(Themas)\ STRUCT_VECT(Themas)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1552,7 +1552,7 @@ private:
PROP(uint8,ThemaState)\ PROP(uint8,ThemaState)\
PROP(uint16,RiteTaskStatePacked)\ PROP(uint16,RiteTaskStatePacked)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1566,7 +1566,7 @@ private:
PROP(uint32,Duration)\ PROP(uint32,Duration)\
PROP(uint32,LogoffTime)\ PROP(uint32,LogoffTime)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1590,7 +1590,7 @@ private:
PROP_GAME_CYCLE_COMP(_Date)\ PROP_GAME_CYCLE_COMP(_Date)\
LPROP2(_EventFaction, string, if (!_EventFaction.empty()), _EventFaction, setEventFaction(val))\ 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" #include "game_share/persistent_data_template.h"

20
code/ryzom/server/src/entities_game_service/player_manager/ring_reward_points.cpp
View file

@ -588,11 +588,13 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R
} }
// in any case, generate a mission event // 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"); CMissionEventTaggedRingScenarioDone event("blabla");
_ParentCharacter->processMissionEvent(event); _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 // 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); 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 *** */ /* *** todo *** */
#pragma message (NL_LOC_WRN "Implements mission step validation") //#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 '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 // NB : need to return grr_ok_rare if rare item were gained
// calculate the reward points of this level that the player has // 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 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 *** */ /* *** todo *** */
// some handy temporaries // some handy temporaries
@ -776,7 +781,8 @@ CRingRewardPoints::TGenerateRewardResult CRingRewardPointsImpl::generateReward(R
} }
// NB : need to return grr_ok_rare if rare item were gained // NB : need to return grr_ok_rare if rare item were gained
#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
} }
LOG("RRP generateReward(%s): %s: - SUCCESS", rewardLevel.toString().c_str(), _ParentCharacter->getId().toString().c_str()); 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],\ _HistoricRRP[i],\
if (key.size()==6) { uint32 idx=(key[5]-'A'); if (idx <R2::TSessionLevel::nb_enum_items) _HistoricRRP[idx]=val; } )\ if (key.size()==6) { uint32 idx=(key[5]-'A'); if (idx <R2::TSessionLevel::nb_enum_items) _HistoricRRP[idx]=val; } )\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/pvp_faction_reward_manager.cpp
View file

@ -1377,7 +1377,7 @@ NLMISC_COMMAND(addFactionPoint, "add (or substract) faction point in faction poo
PROP(uint8, Level)\ PROP(uint8, Level)\
PROP(sint32, FactionPointsPool)\ PROP(sint32, FactionPointsPool)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
@ -1397,5 +1397,5 @@ NLMISC_COMMAND(addFactionPoint, "add (or substract) faction point in faction poo
PROP( uint32, _NbTotems )\ PROP( uint32, _NbTotems )\
STRUCT_ARRAY( _FactionsPossessions, PVP_CLAN::NbClans )\ STRUCT_ARRAY( _FactionsPossessions, PVP_CLAN::NbClans )\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction_reward_manager/totem_base.cpp
View file

@ -415,5 +415,5 @@ bool CTotemBase::canStartBuilding( CCharacter* actor )
PROP(float, _TotemMaxHP)\ PROP(float, _TotemMaxHP)\
PROP(float, _TotemCurrentHP)\ PROP(float, _TotemCurrentHP)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/shop_type/dynamic_items.cpp
View file

@ -69,7 +69,7 @@ extern CVariable<bool> EGSLight;
}\ }\
)\ )\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
#undef PERSISTENT_DATA #undef PERSISTENT_DATA

2
code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
View file

@ -180,7 +180,7 @@ void CTradeBase::copy( IItemTrade * itt )
CGameItem::CPersistentApplyArg applyArgs;\ CGameItem::CPersistentApplyArg applyArgs;\
_ItemPtr->apply(pdr, applyArgs))\ _ItemPtr->apply(pdr, applyArgs))\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

2
code/ryzom/server/src/entities_game_service/shop_type/items_for_sale.cpp
View file

@ -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" #include "game_share/persistent_data_template.h"

4
code/ryzom/server/src/frontend_service/client_host.cpp
View file

@ -32,9 +32,9 @@ using namespace CLFECOMMON;
#ifdef HALF_FREQUENCY_SENDING_TO_CLIENT #ifdef HALF_FREQUENCY_SENDING_TO_CLIENT
#pragma message ("HALF_FREQUENCY_SENDING_TO_CLIENT") //#pragma message ("HALF_FREQUENCY_SENDING_TO_CLIENT")
#else #else
#pragma message ("FULL_FREQUENCY_SENDING_TO_CLIENT") //#pragma message ("FULL_FREQUENCY_SENDING_TO_CLIENT")
#endif #endif

2
code/ryzom/server/src/frontend_service/uid_impulsions.cpp
View file

@ -64,7 +64,7 @@ static void impulsionSelectChar(uint32 uid, NLMISC::CBitMemStream &bms, NLMISC::
} }
// TODO : ring : add character/role checking // 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 // Check authorized character slot
if (((ch->AuthorizedCharSlot != 0xF) && (selectCharMsg.c != ch->AuthorizedCharSlot)) && if (((ch->AuthorizedCharSlot != 0xF) && (selectCharMsg.c != ch->AuthorizedCharSlot)) &&

6
code/ryzom/server/src/server_share/stat_db_tree_pd.cpp
View file

@ -35,7 +35,7 @@ using namespace NLMISC;
PROP(string,Path)\ PROP(string,Path)\
PROP(sint32,Value)\ PROP(sint32,Value)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
// **************************************************************************** // ****************************************************************************
@ -46,7 +46,7 @@ using namespace NLMISC;
PROP_MAP(CEntityId,sint32,PlayerValues)\ PROP_MAP(CEntityId,sint32,PlayerValues)\
PROP_MAP(EGSPD::TGuildId,sint32,GuildValues)\ PROP_MAP(EGSPD::TGuildId,sint32,GuildValues)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
// **************************************************************************** // ****************************************************************************
@ -55,5 +55,5 @@ using namespace NLMISC;
#define PERSISTENT_DATA\ #define PERSISTENT_DATA\
STRUCT_VECT(ValueLeavesPD)\ STRUCT_VECT(ValueLeavesPD)\
#pragma message( PERSISTENT_GENERATION_MESSAGE ) //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"

4
code/ryzom/tools/patch_gen/patch_gen_common.cpp
View file

@ -489,9 +489,7 @@ uint32 CPackageDescription::getPackageVersionNumber()
PROP(std::string,_RefDirectory)\ PROP(std::string,_RefDirectory)\
PROP(std::string,_NextVersionFile)\ PROP(std::string,_NextVersionFile)\
#ifdef NL_OS_WINDOWS //#pragma message( PERSISTENT_GENERATION_MESSAGE )
#pragma message( PERSISTENT_GENERATION_MESSAGE )
#endif // NL_OS_WINDOWS
#include "game_share/persistent_data_template.h" #include "game_share/persistent_data_template.h"
#undef PERSISTENT_CLASS #undef PERSISTENT_CLASS