Changeset 2035 for code/branches/objecthierarchy/src

Timestamp:

Oct 28, 2008, 10:52:12 PM (16 years ago)

Author:

scheusso

Message:

objects with non-existing creator (on client-side) get ignored now

Location:

code/branches/objecthierarchy/src/network

Files:

• GamestateManager.cc (modified) (1 diff)
• Synchronisable.cc (modified) (2 diffs)
• packet/Gamestate.cc (modified) (1 diff)

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

@@ -81 +81 @@
     for(it = gamestateQueue.begin(); it!=gamestateQueue.end(); it++){
       bool b = processGamestate(it->second);
-//      assert(b);
+      assert(b);
       delete it->second;
     }

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

@@ -154 +154 @@
     if (header->creatorID != OBJECTID_UNKNOWN)
     {
-        Synchronisable* synchronisable_creator = Synchronisable::getSynchronisable(header->creatorID);
-        if (!synchronisable_creator)
-            return 0;
-        else
-            creator = dynamic_cast<orxonox::BaseObject*>(synchronisable_creator);
+      Synchronisable* synchronisable_creator = Synchronisable::getSynchronisable(header->creatorID);
+      if (!synchronisable_creator)
+      {
+        mem += header->size; //.TODO: this suckz.... remove size from header
+        return 0;
+      }
+      else
+        creator = dynamic_cast<orxonox::BaseObject*>(synchronisable_creator);
     }
     orxonox::BaseObject *bo = id->fabricate(creator);
@@ -170 +173 @@
           // update data and create object/entity...
     bool b = no->updateData(mem, mode, true);
-//    assert(b);
+    assert(b);
     if (b)
     {

code/branches/objecthierarchy/src/network/packet/Gamestate.cc

@@ -157 +157 @@
     if(!s)
     {
-      s = Synchronisable::fabricate(mem, mode);
-      return false;
-//       if(!s)
-//         return false;
+      Synchronisable::fabricate(mem, mode);
     }
     else
     {
       bool b = s->updateData(mem, mode);
-//      assert(b);
+      assert(b);
       //if(!s->updateData(mem, mode))
         //return false;