Changeset 1944 for code/branches/objecthierarchy/src/network/Server.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/Server.cc (modified) (2 diffs)

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