Changeset 1361 for code/branches/merge/src/network/GameStateClient.cc

Timestamp:

May 22, 2008, 2:09:33 PM (16 years ago)

Author:

scheusso

Message:

reverted some changes from previous version

File:

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

code/branches/merge/src/network/GameStateClient.cc

@@ -47 +47 @@
     COUT(5) << "this: " << this << std::endl;
     last_diff_=0;
-    last_gamestate_=GAMESTATEID_INITIAL-1;
   }
 
@@ -57 +56 @@
     printGameStateMap();
     GameState *gs, *reference;
-    /*if(compstate->id<last_gamestate_){
-      // network packets got messed up
-      COUT(3) << "received an obsolete gamestate" << std::endl;
-      return false;
-    }*/
     if(compstate->diffed && compstate->base_id!=GAMESTATEID_INITIAL){
       std::map<int, GameState*>::iterator it = gameStateMap.find(compstate->base_id);
@@ -83 +77 @@
         COUT(4) << "adding decoded gs with id: " << gs->id << " diffed from: " << gs->base_id << std::endl;
         last_diff_=gs->base_id;
-        //last_gamestate_=gs->id;
         return true;
       }else{
@@ -156 +149 @@
           Synchronisable *no = dynamic_cast<Synchronisable *>(id->fabricate());
           COUT(4) << "loadsnapshot: classid: " << sync.classID << " objectID: " << sync.objectID << " length: " << sync.length << std::endl;
-          if(!no){
-            COUT(2) << "coudl not frabricate classid: " << sync.classID << " objectID: " << sync.objectID << " identifier: " << id << std::endl;
-            break;
-          }
           no->objectID=sync.objectID;
           no->classID=sync.classID;