Changeset 4324 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

May 27, 2005, 2:13:19 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: added a debug level at the end to be able to experiment a little with new load modules and game ideas

Location:

orxonox/trunk/src/util

Files:

• loading/game_loader.cc (modified) (1 diff)
• object_manager.cc (modified) (3 diffs)

orxonox/trunk/src/util/loading/game_loader.cc

@@ -82 +82 @@
       delete campaignName;
     }
+  World* world0 = new World(DEBUG_WORLD_0);
+  world0->setNextStoryID(WORLD_ID_GAMEEND);
+  this->currentCampaign->addEntity(world0, WORLD_ID_2);
 }
 

orxonox/trunk/src/util/object_manager.cc

@@ -19 +19 @@
 #include "list.h"
 
-#include "projectile.h"
 
 using namespace std;
@@ -72 +71 @@
     this->managedObjectList[index]->add(object);
   else
-    PRINTF(0)(" Error: unable to add object to the list nr. %i: no list initialized - ignoring\n", index);
+    PRINTF(0)(" Critical: unable to add object to the list nr. %i: no list initialized - ignoring\n", index);
 }
 
@@ -82 +81 @@
       BaseObject* obj = this->managedObjectList[index]->firstElement();
       this->managedObjectList[index]->remove(obj);
+      if( unlikely(obj == NULL))
+        {
+          PRINTF(0)("Critical: there was no object anymore in the dead list! This could result in Segfaults\n");
+        }
       return obj;
     }
   else
-    PRINTF(0)(" Error: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+    PRINTF(0)(" Critical: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+  return NULL;
 }