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

Merge

Browse source
This commit is contained in:
kervala 2010-09-11 19:31:30 +02:00
commit 7cd92db05b
4 changed files with 195 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/ryzom/server/src/ai_share/ai_wrapper_server.cpp
View file

@ -45,7 +45,7 @@ using namespace NLMISC;
namespace R2 namespace R2
{ {
extern NLLIGO::CLigoConfig * LigoConfigPtr; NLLIGO::CLigoConfig * LigoConfigPtr;
} }
void CAiWrapperServer::init(NLLIGO::CLigoConfig * ligoConfig) void CAiWrapperServer::init(NLLIGO::CLigoConfig * ligoConfig)

11
code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp
View file

@ -51,18 +51,13 @@ void foo()
admin_modules_forceLink(); admin_modules_forceLink();
} }
namespace R2 namespace R2
{ {
// The ligo config // The ligo config
NLLIGO::CLigoConfig* LigoConfigPtr; extern NLLIGO::CLigoConfig * LigoConfigPtr;
CR2LigoConfig R2LigoConfig; CR2LigoConfig R2LigoConfig;
} }
void CDynamicScenarioService::forwardToStringManagerModule (CMessage &msgin) void CDynamicScenarioService::forwardToStringManagerModule (CMessage &msgin)
{ {
TDataSetRow senderId; TDataSetRow senderId;

9
code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
View file

@ -108,18 +108,15 @@ extern vector<CMainlandSummary> Mainlands;
extern CVariable<bool> DontUseSU; extern CVariable<bool> DontUseSU;
// For shard names
extern NLMISC::CVariable<uint32> FixedSessionId;
// Send to client if name is valide (true for valide) // Send to client if name is valide (true for valide)
void sendIfNameIsValide( uint32 userId, bool nameValide ); void sendIfNameIsValide( uint32 userId, bool nameValide );
// finish create char // finish create char
void cbCreateChar_part2(uint32 userId, const CCreateCharMsg &createCharMsg, bool ok); void cbCreateChar_part2(uint32 userId, const CCreateCharMsg &createCharMsg, bool ok);
// For a mainland shard (non ring), we need the session id to initialize the normal position stack with
// the current far position after loading an old character file with no stored session id.
// (Alternatively, the ServerAnimationModule could sent it to any mainland shard, looking up in the DB
// ring:sessions).
NLMISC::CVariable<uint32> FixedSessionId( "egs", "FixedSessionId", "For a mainland shard, the session id", 0, 0, true );
// (!IsRingShard only) (For mainland shard) // (!IsRingShard only) (For mainland shard)
// This parameter controls what we do we characters coming from another mainland shard. // This parameter controls what we do we characters coming from another mainland shard.
// It allows to test character files from a live shard on a private shard. // It allows to test character files from a live shard on a private shard.

7
code/ryzom/server/src/server_share/mail_forum_validator.cpp
View file

@ -50,8 +50,11 @@ CMailForumValidator::TMailNotification CMailForumValidator::_Notification = NULL
// Use Mail/Forum // Use Mail/Forum
CVariable<bool> UseMailForum("web", "UseMailForum", "Allow mail/forum validation", true, 0, true); CVariable<bool> UseMailForum("web", "UseMailForum", "Allow mail/forum validation", true, 0, true);
// For shard names // For a mainland shard (non ring), we need the session id to initialize the normal position stack with
extern NLMISC::CVariable<uint32> FixedSessionId; // the current far position after loading an old character file with no stored session id.
// (Alternatively, the ServerAnimationModule could sent it to any mainland shard, looking up in the DB
// ring:sessions).
NLMISC::CVariable<uint32> FixedSessionId( "egs", "FixedSessionId", "For a mainland shard, the session id", 0, 0, true );
/* /*
* Constructor * Constructor