mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-29 17:09:02 +02:00
Code Issues Projects Releases Wiki Activity

- rollback network changes

Browse Source
This commit is contained in:
Mark Vejvoda
2011-11-25 21:56:36 +00:00
parent 09241222ca
commit ff2252bf41
7 changed files with 117 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ std::string ClientInterface::getServerIpAddress() {
}
void ClientInterface::updateLobby() {
NetworkMessageType networkMessageType = getNextMessageType(0);
NetworkMessageType networkMessageType = getNextMessageType();
switch(networkMessageType)
{
case nmtInvalid:
@@ -725,7 +725,7 @@ void ClientInterface::waitUntilReady(Checksum* checksum) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
return;
}
NetworkMessageType networkMessageType = getNextMessageType(0);
NetworkMessageType networkMessageType = getNextMessageType();
// consume old messages from the lobby
bool discarded = shouldDiscardNetworkMessage(networkMessageType);
@@ -1038,7 +1038,7 @@ NetworkMessageType ClientInterface::waitForMessage()
NetworkMessageType msg = nmtInvalid;
//uint64 waitLoopCount = 0;
while(msg == nmtInvalid) {
msg = getNextMessageType(5);
msg = getNextMessageType();
if(msg == nmtInvalid) {
if(chrono.getMillis() % 250 == 0 && isConnected() == false) {
if(quit == false) {