mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-10-01 01:46:42 +02:00
Code Issues Projects Releases Wiki Activity

- changed to git version stamp

Browse Source
This commit is contained in:
SoftCoder
2013-11-29 13:13:30 -08:00
parent 1a8673feb3
commit f217db38f1
13 changed files with 95 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/glest_game/network/client_interface.cpp
View File

@@ -553,7 +553,7 @@ void ClientInterface::updateLobby() {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] got NetworkMessageIntro, networkMessageIntro.getGameState() = %d, versionString [%s], sessionKey = %d, playerIndex = %d, serverFTPPort = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,networkMessageIntro.getGameState(),versionString.c_str(),sessionKey,playerIndex,serverFTPPort);
//check consistency
bool compatible = checkVersionComptability(networkMessageIntro.getVersionString(), getNetworkVersionSVNString());
bool compatible = checkVersionComptability(networkMessageIntro.getVersionString(), getNetworkVersionGITString());
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] got NetworkMessageIntro, networkMessageIntro.getGameState() = %d, versionString [%s], sessionKey = %d, playerIndex = %d, serverFTPPort = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,networkMessageIntro.getGameState(),versionString.c_str(),sessionKey,playerIndex,serverFTPPort);
@@ -568,12 +568,12 @@ void ClientInterface::updateLobby() {
if(strncmp(platformFreeVersion.c_str(),networkMessageIntro.getVersionString().c_str(),strlen(platformFreeVersion.c_str())) != 0) {
string playerNameStr = getHumanPlayerName();
sErr = "Server and client binary mismatch!\nYou have to use the exactly same binaries!\n\nServer: " + networkMessageIntro.getVersionString() +
"\nClient: " + getNetworkVersionSVNString() + " player [" + playerNameStr + "]";
"\nClient: " + getNetworkVersionGITString() + " player [" + playerNameStr + "]";
printf("%s\n",sErr.c_str());
sendTextMessage("Server and client binary mismatch!!",-1, true,"");
sendTextMessage(" Server:" + networkMessageIntro.getVersionString(),-1, true,"");
sendTextMessage(" Client: "+ getNetworkVersionSVNString(),-1, true,"");
sendTextMessage(" Client: "+ getNetworkVersionGITString(),-1, true,"");
sendTextMessage(" Client player [" + playerNameStr + "]",-1, true,"");
}
else {
@@ -581,7 +581,7 @@ void ClientInterface::updateLobby() {
string playerNameStr = getHumanPlayerName();
sErr = "Warning, Server and client are using the same version but different platforms.\n\nServer: " + networkMessageIntro.getVersionString() +
"\nClient: " + getNetworkVersionSVNString() + " player [" + playerNameStr + "]";
"\nClient: " + getNetworkVersionGITString() + " player [" + playerNameStr + "]";
//printf("%s\n",sErr.c_str());
}
@@ -604,7 +604,7 @@ void ClientInterface::updateLobby() {
//send intro message
Lang &lang= Lang::getInstance();
NetworkMessageIntro sendNetworkMessageIntro(
sessionKey,getNetworkVersionSVNString(),
sessionKey,getNetworkVersionGITString(),
getHumanPlayerName(),
-1,
nmgstOk,