Changeset 1944

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)

Location:

code/branches/objecthierarchy/src/network

Files:

• GamestateClient.cc (modified) (1 diff)
• GamestateManager.cc (modified) (2 diffs)
• Server.cc (modified) (2 diffs)

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

@@ -102 +102 @@
   packet::Gamestate *GamestateClient::getGamestate(){
     packet::Gamestate *gs = new packet::Gamestate();
-    gs->collectData(0);
+    if(!gs->collectData(0)){
+      delete gs;
+      return 0;
+    }
     return gs;
   }

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);

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

@@ -239 +239 @@
       if(gs==NULL){
         COUT(2) << "Server: could not generate gamestate (NULL from compress)" << std::endl;
+        temp = temp->next();
         continue;
       }
@@ -324 +325 @@
     g->setClientID(temp->getID());
     b = g->collectData(0);
-    assert(b);
+    if(!b)
+      return false; //no data for the client
     b = g->compressData();
     assert(b);