Changeset 1431 for code/branches/network/src/network/Client.cc

Timestamp:

May 26, 2008, 9:21:53 PM (16 years ago)

Author:

scheusso

Message:

another one bites the dust: solved that problem with zeros in the gamestate

File:

• code/branches/network/src/network/Client.cc (modified) (4 diffs)

code/branches/network/src/network/Client.cc

@@ -85 +85 @@
     isConnected=false;
     isSynched_=false;
+    gameStateFailure_=false;
   }
 
@@ -95 +96 @@
     isConnected=false;
     isSynched_=false;
+    gameStateFailure_=false;
   }
 
@@ -105 +107 @@
     isConnected=false;
     isSynched_=false;
+    gameStateFailure_=false;
   }
 
@@ -247 +250 @@
     }
     int gameStateID = gamestate.processGameState();
-    if(gameStateID!=GAMESTATEID_INITIAL){
+    if(gameStateID==GAMESTATEID_INITIAL)
+      if(gameStateFailure_){
+        if(!client_connection.addPacket(pck_gen.acknowledgement(GAMESTATEID_INITIAL)))
+          COUT(3) << "could not (negatively) ack gamestate" << std::endl;
+        else 
+          COUT(4) << "negatively acked a gamestate" << std::endl;
+        }
+      else
+        gameStateFailure_=true;
+    else if(gameStateID!=0){
       // ack gamestate and set synched
       if(!isSynched_)
         isSynched_=true;
+      gameStateFailure_=false;
       if(!client_connection.addPacket(pck_gen.acknowledgement(gameStateID)))
         COUT(3) << "could not ack gamestate" << std::endl;
-    }
+    }// otherwise we had no gamestate to load
     gamestate.cleanup();
     if(!client_connection.sendPackets())