Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small change to compiler version stamp

This commit is contained in:
Mark Vejvoda 2010-04-30 02:34:19 +00:00
parent 19cd66fc2d
commit e7cb595ae8
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/facilities/game_util.cpp
View File

@ -35,7 +35,7 @@ string getCrashDumpFileName(){
string getNetworkVersionString() {
string version = glestVersionString + " built: " + string(__DATE__) + " " + string(__TIME__);
#if defined(WIN32) && defined(_MSC_VER)
version += " MSC_VER " + _MSC_VER;
version += " Compiled using MSC_VER: " + intToStr(_MSC_VER);
#elif defined(__GNUC__)
#if defined(__GNUC__)
@ -49,7 +49,7 @@ string getNetworkVersionString() {
# endif
#endif
version += " GNUC_VERSION " + intToStr(__GNUC_VERSION__);
version += " Compiled using GNUC_VERSION: " + intToStr(__GNUC_VERSION__);
#endif
return version;
}

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

@ -667,7 +667,7 @@ void ClientInterface::waitForMessage()
return;
}
if(chrono.getMillis()>messageWaitTimeout)
if(chrono.getMillis() > messageWaitTimeout)
{
//throw runtime_error("Timeout waiting for message");
sendTextMessage("Timeout waiting for message",-1);
@ -677,7 +677,7 @@ void ClientInterface::waitForMessage()
return;
}
sleep(waitSleepTime);
//sleep(waitSleepTime);
waitLoopCount++;
}

2
source/glest_game/network/network_message.cpp
View File

@ -230,7 +230,7 @@ NetworkMessageCommandList::NetworkMessageCommandList(int32 frameCount){
}
bool NetworkMessageCommandList::addCommand(const NetworkCommand* networkCommand){
if(data.commandCount<maxCommandCount){
if(data.commandCount < maxCommandCount){
data.commands[static_cast<int>(data.commandCount)]= *networkCommand;
data.commandCount++;
return true;

3
source/glest_game/network/network_message.h
View File

@ -178,7 +178,8 @@ public:
#pragma pack(push, 1)
class NetworkMessageCommandList: public NetworkMessage{
private:
static const int maxCommandCount= 16*4;
//static const int maxCommandCount= 16*4;
static const int maxCommandCount = (16 * 4) * 2;
private:
struct Data{

3
source/glest_game/network/server_interface.cpp
View File

@ -322,7 +322,8 @@ void ServerInterface::waitUntilReady(Checksum* checksum){
return;
}
waitingForHosts.push_back(connectionSlot->getHostName());
//waitingForHosts.push_back(connectionSlot->getHostName());
waitingForHosts.push_back(connectionSlot->getName());
allReady= false;
}