Changeset 8315

Timestamp:

Apr 23, 2011, 10:28:14 PM (14 years ago)

Author:

scheusso

Message:

fixing an assertion

File:

• code/branches/network6/src/libraries/network/GamestateManager.cc (modified) (1 diff)

code/branches/network6/src/libraries/network/GamestateManager.cc

@@ -287 +287 @@
 //     }
 
-    assert(curid==GAMESTATEID_INITIAL || curid<=gamestateID);
-    COUT(5) << "acking gamestate " << gamestateID << " for peerID: " << peerID << " curid: " << curid << std::endl;
+//    assert(curid==GAMESTATEID_INITIAL || curid<=gamestateID); // this line is commented out because acknowledgements are unreliable and may arrive in distorted order
+    if( gamestateID <= curid )
+        return true;
+COUT(4) << "acking gamestate " << gamestateID << " for peerID: " << peerID << " curid: " << curid << std::endl;
     std::map<uint32_t, packet::Gamestate*>::iterator it2;
     for( it2=it->second.gamestates.begin(); it2!=it->second.gamestates.end(); )