Changeset 6450 for code/branches/network2/src/libraries/network/GamestateManager.cc

Timestamp:

Jan 18, 2010, 12:05:57 AM (14 years ago)

Author:

scheusso

Message:

further traffic reduction:

• synchronisableheaders are now smaller( by 2 bytes per header )
• variableID of SynchronisableVariables are now uint8_t → max 256 synchronised variables per Synchronisable

File:

• code/branches/network2/src/libraries/network/GamestateManager.cc (modified) (2 diffs)

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

@@ -190 +190 @@
 //       packet::Gamestate* gs = new packet::Gamestate(*gamestate);
 //     packet::Gamestate* gs = gamestate;
-    packet::Gamestate *gs = new packet::Gamestate(*gamestate);
+    packet::Gamestate *gs = new packet::Gamestate(*gamestate); //TODO: is this neccessary ?
 //     packet::Gamestate *gs = new packet::Gamestate();
 //     gs->collectData( id_, 0x1 );
@@ -201 +201 @@
     if(base)
     {
-
-//       COUT(3) << "diffing" << std::endl;
-//       packet::Gamestate* gs1  = gs;
-      packet::Gamestate *diffed = gs->diff(base);
-      if( diffed->getDataSize() == 0 )
+      packet::Gamestate *diffed1 = gs->diffVariables(base);
+      if( diffed1->getDataSize() == 0 )
       {
-        delete diffed;
+        delete diffed1;
         destgamestate = 0;
         return;
       }
-      else
-        gs = diffed;
-      //packet::Gamestate *gs2 = diffed->undiff(gs);
-//       assert(*gs == *gs2);
-//       packet::Gamestate* gs2 = gs->undiff(client);
-//       gs = new packet::Gamestate(*gs);
-//       assert(*gs1==*gs2);
-    }
-    else{
+      gs = diffed1;
+    }
+    else
+    {
       gs = new packet::Gamestate(*gs);
     }