Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use BuildName only on Unix

Browse source
This commit is contained in:
kervala 2014-03-23 20:31:59 +01:00
parent 37f9c6dd7e
commit 9ac2a69504
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/ryzom/client/src/login_patch.cpp
View file

@ -2328,7 +2328,6 @@ void CCheckThread::run ()
uint32 i, j, k; uint32 i, j, k;
// Check if the client version is the same as the server version // Check if the client version is the same as the server version
string sClientVersion = pPM->getClientVersion(); string sClientVersion = pPM->getClientVersion();
string sClientNewVersion = ClientCfg.BuildName;
string sServerVersion = pPM->getServerVersion(); string sServerVersion = pPM->getServerVersion();
ucstring sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") "; ucstring sTranslate = CI18N::get("uiClientVersion") + " (" + sClientVersion + ") ";
sTranslate += CI18N::get("uiServerVersion") + " (" + sServerVersion + ")"; sTranslate += CI18N::get("uiServerVersion") + " (" + sServerVersion + ")";
@ -2342,12 +2341,16 @@ void CCheckThread::run ()
return; return;
} }
sint32 nServerVersion, nClientVersion, nClientNewVersion; sint32 nServerVersion, nClientVersion;
fromString(sServerVersion, nServerVersion); fromString(sServerVersion, nServerVersion);
fromString(sClientVersion, nClientVersion); fromString(sClientVersion, nClientVersion);
fromString(sClientNewVersion, nClientNewVersion);
#ifdef NL_OS_UNIX #ifdef NL_OS_UNIX
string sClientNewVersion = ClientCfg.BuildName;
sint32 nClientNewVersion;
fromString(sClientNewVersion, nClientNewVersion);
// servers files are not compatible with current client, use last client version // servers files are not compatible with current client, use last client version
if (nClientNewVersion && nServerVersion > nClientNewVersion) if (nClientNewVersion && nServerVersion > nClientNewVersion)
{ {