Changeset 1944 for code/branches/objecthierarchy/src/network/GamestateManager.cc

Timestamp:

Oct 19, 2008, 12:09:01 AM (16 years ago)

Author:

scheusso

Message:

Some fixes in gamestate generation and handling (especially when no
objects are present)

File:

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

code/branches/objecthierarchy/src/network/GamestateManager.cc

@@ -91 +91 @@
   bool GamestateManager::getSnapshot(){
     reference = new packet::Gamestate();
-    reference->collectData(++id_);
-    //COUT(4) << "inserting gamestate: " << reference << std::endl;
-    //gamestateMap_.insert(std::pair<int, packet::Gamestate*>(id_, reference));
-//     gamestateUsed[id_]=0;
+    if(!reference->collectData(++id_)){ //we have no data to send
+      delete reference;
+      reference=0;
+    }
     return true;
   }
@@ -131 +131 @@
     packet::Gamestate *gs;
     int gID = ClientInformation::findClient(clientID)->getGamestateID();
+    if(!reference)
+      return 0;
     gs = reference->doSelection(clientID);
 //     gs = new packet::Gamestate(*reference);