From 2e40a2a5937d217eb51f6a4d0b625746b173b854 Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 11 Sep 2010 19:26:22 +0200 Subject: [PATCH] Fixed: Servers link errors under Linux --- code/ryzom/server/src/ai_share/ai_wrapper_server.cpp | 2 +- .../dynamic_scenario_service.cpp | 8 +++----- .../entity_manager/entity_callbacks.cpp | 9 +++------ .../server/src/server_share/mail_forum_validator.cpp | 7 +++++-- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/code/ryzom/server/src/ai_share/ai_wrapper_server.cpp b/code/ryzom/server/src/ai_share/ai_wrapper_server.cpp index d29b748fe..d1b37eb4a 100644 --- a/code/ryzom/server/src/ai_share/ai_wrapper_server.cpp +++ b/code/ryzom/server/src/ai_share/ai_wrapper_server.cpp @@ -45,7 +45,7 @@ using namespace NLMISC; namespace R2 { - extern NLLIGO::CLigoConfig * LigoConfigPtr; + NLLIGO::CLigoConfig * LigoConfigPtr; } void CAiWrapperServer::init(NLLIGO::CLigoConfig * ligoConfig) diff --git a/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp b/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp index 35890049c..dd2a2c255 100644 --- a/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp +++ b/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.cpp @@ -54,11 +54,9 @@ void foo() namespace R2 { -// The ligo config -NLLIGO::CLigoConfig* LigoConfigPtr; -CR2LigoConfig R2LigoConfig; - - + // The ligo config + extern NLLIGO::CLigoConfig * LigoConfigPtr; + CR2LigoConfig R2LigoConfig; } diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp index 4fa1a3980..7081c00cf 100644 --- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp +++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp @@ -108,18 +108,15 @@ extern vector Mainlands; extern CVariable DontUseSU; +// For shard names +extern NLMISC::CVariable FixedSessionId; + // Send to client if name is valide (true for valide) void sendIfNameIsValide( uint32 userId, bool nameValide ); // finish create char 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 FixedSessionId( "egs", "FixedSessionId", "For a mainland shard, the session id", 0, 0, true ); - // (!IsRingShard only) (For 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. diff --git a/code/ryzom/server/src/server_share/mail_forum_validator.cpp b/code/ryzom/server/src/server_share/mail_forum_validator.cpp index 2338735dc..2c2b67a2f 100644 --- a/code/ryzom/server/src/server_share/mail_forum_validator.cpp +++ b/code/ryzom/server/src/server_share/mail_forum_validator.cpp @@ -50,8 +50,11 @@ CMailForumValidator::TMailNotification CMailForumValidator::_Notification = NULL // Use Mail/Forum CVariable UseMailForum("web", "UseMailForum", "Allow mail/forum validation", true, 0, true); -// For shard names -extern NLMISC::CVariable FixedSessionId; +// 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 FixedSessionId( "egs", "FixedSessionId", "For a mainland shard, the session id", 0, 0, true ); /* * Constructor