Changeset 1523 for code/branches/network/src/network/GameStateManager.cc

Timestamp:

Jun 3, 2008, 12:06:09 AM (16 years ago)

Author:

scheusso

Message:

some enhanced error handling

File:

• code/branches/network/src/network/GameStateManager.cc (modified) (3 diffs)

code/branches/network/src/network/GameStateManager.cc

@@ -44 +44 @@
 #include <iostream>
 #include <zlib.h>
+#include <assert.h>
 
 #include "core/CoreIncludes.h"
@@ -473 +474 @@
     if(gamestateID == GAMESTATEID_INITIAL){
       temp->setGameStateID(GAMESTATEID_INITIAL);
-      if(curid!=GAMESTATEID_INITIAL)
+      if(curid!=GAMESTATEID_INITIAL){
+        assert(gameStateUsed.find(curid)!=gameStateUsed.end());
         --(gameStateUsed.find(curid)->second);
+      }
       return;
     }
@@ -484 +487 @@
 //     deleteUnusedGameState(curid);
     //increase gamestateused
-    if(curid!=GAMESTATEID_INITIAL)
-      --(gameStateUsed.find(curid)->second);
-    ++(gameStateUsed.find(gamestateID)->second);
-    temp->setGameStateID(gamestateID);
+    std::map<int, int>::iterator it = gameStateUsed.find(curid);
+    if(curid!=GAMESTATEID_INITIAL){
+      if(it!=gameStateUsed.end())
+        --(it->second);
+    }
+    it = gameStateUsed.find(gamestateID);
+    if(it!=gameStateUsed.end()){
+      ++(it->second);
+      temp->setGameStateID(gamestateID);
+    }
     /*
     GameState *old = clientGameState[clientID];