Fixed: Servers link errors under Linux
This commit is contained in:
parent
7961fe8838
commit
2e40a2a593
4 changed files with 12 additions and 14 deletions
|
@ -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)
|
||||||
|
|
|
@ -54,11 +54,9 @@ void foo()
|
||||||
|
|
||||||
namespace R2
|
namespace R2
|
||||||
{
|
{
|
||||||
// The ligo config
|
// The ligo config
|
||||||
NLLIGO::CLigoConfig* LigoConfigPtr;
|
extern NLLIGO::CLigoConfig * LigoConfigPtr;
|
||||||
CR2LigoConfig R2LigoConfig;
|
CR2LigoConfig R2LigoConfig;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue