Changeset 7153 for code/branches/presentation3/src/libraries/network/GamestateClient.cc

Timestamp:

Jul 12, 2010, 1:08:58 PM (14 years ago)

Author:

scheusso

Message:

• merged network2 branch into presentation3 branch (lots of network traffic and cpu load improvements)
• fixed network related bugs in BigExplosion

Location:

code/branches/presentation3

Files:

• . (modified) (1 prop)
• src/libraries/network/GamestateClient.cc (modified) (2 diffs)

code/branches/presentation3/src/libraries/network/GamestateClient.cc

@@ -161 +161 @@
       assert(b);
     }
-    if(gs->isDiffed()){
-      packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
-      if(!base){
-        COUT(3) << "could not find base gamestate id: " << gs->getBaseID() << endl;
-        delete gs;
-        return 0;
-      }
-//       assert(base); //TODO: fix this
-      packet::Gamestate *undiffed = gs->undiff(base);
-      delete gs;
-      gs=undiffed;
-      COUT(5) << "successfully undiffed gamestate id: " << undiffed->getID() << std::endl;
+    if(gs->isDiffed())
+    {
+      assert(0);
+//       packet::Gamestate *base = gamestateMap_[gs->getBaseID()];
+//       if(!base)
+//       {
+//         COUT(0) << "could not find base gamestate id: " << gs->getBaseID() << endl;
+//         assert(0);
+//         delete gs;
+//         return 0;
+//       }
+//       packet::Gamestate *undiffed = gs->undiff(base);
+//       delete gs;
+//       gs=undiffed;
+//       COUT(5) << "successfully undiffed gamestate id: " << undiffed->getID() << std::endl;
     }
     if(gs->spreadData(0x2))
@@ -178 +181 @@
     else
     {
-      COUT(3) << "could not spread gamestate" << endl;
+      COUT(0) << "could not spread gamestate" << endl;
+      assert(0);
       return NULL;
     }