Changeset 1360 for code/trunk/src/network/GameStateClient.cc

Timestamp:

May 22, 2008, 2:02:06 PM (16 years ago)

Author:

rgrieder

Message:

merged merge branch back to trunk

File:

• code/trunk/src/network/GameStateClient.cc (modified) (5 diffs)

code/trunk/src/network/GameStateClient.cc

@@ -47 +47 @@
     COUT(5) << "this: " << this << std::endl;
     last_diff_=0;
+    last_gamestate_=GAMESTATEID_INITIAL-1;
   }
 
@@ -56 +57 @@
     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);
@@ -77 +83 @@
         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{
@@ -145 +152 @@
           if(!id){
             COUT(4) << "We could not identify a new object; classid: " << sync.classID << std::endl;
-            continue;
+            return false;
           }
           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;
           // update data and create object/entity...
-          if( !no->updateData(sync) )
+          if( !no->updateData(sync) ){
             COUT(1) << "We couldn't update the object: " << sync.objectID << std::endl;
+            return false;
+          }
           if( !no->create() )
             COUT(1) << "We couldn't manifest (create() ) the object: " << sync.objectID << std::endl;
@@ -349 +362 @@
     COUT(4) << "using diffed gamestate" << std::endl;
     GameState *t = decode(diff);
+    if(!t)
+      return NULL;
     GameState *r = undiff(old, t);
     delete[] t->data;