Changeset 6120 in orxonox.OLD

Timestamp:

Dec 15, 2005, 12:42:30 AM (18 years ago)

Author:

bensch

Message:

om: some more checks for safety

Location:

branches/objectmanager/src

Files:

• story_entities/world.cc (modified) (1 diff)
• util/object_manager.cc (modified) (4 diffs)
• util/object_manager.h (modified) (1 diff)

branches/objectmanager/src/story_entities/world.cc

@@ -141 +141 @@
   SoundEngine::getInstance()->flushAllSources();
 
-
+  delete ObjectManager::getInstance();
   // erease everything that is left.
   delete PNode::getNullParent();

branches/objectmanager/src/util/object_manager.cc

@@ -27 +27 @@
 
 /**
- * standard constructor
+ * @brief standard constructor
  */
 ObjectManager::ObjectManager ()
@@ -43 +43 @@
 
 /**
-   @brief standard deconstructor
+ * @brief standard deconstructor
+ *
+ * this also removes ALL entitites in existence.
  */
 ObjectManager::~ObjectManager ()
 {
+  this->flush();
   ObjectManager::singletonRef = NULL;
+}
+
+/**
+ * @brief flushes all entities
+ *
+ * this function deletes all entities that exist within the ObjectManager.
+ * It does this by poping each list from the front, and delete the given object.
+ *
+ * automatically called by a destructor.
+ */
+void ObjectManager::flush()
+{
+  for (unsigned int i = 0; i < OM_SIZE; ++i)
+    while(!this->objectLists[i].empty())
+      delete this->objectLists[i].front();
 }
 
@@ -112 +130 @@
 void ObjectManager::debug(OM_LIST omList) const
 {
-  if (omList != OM_INIT)
+  if (omList != OM_INIT || omList == OM_SIZE)
   {
-    PRINT(0)(" +ObjectManager-LIST: '%s'------\n", ObjectManager::OMListToString((OM_LIST) omList));
+    PRINT(0)(" +ObjectManager-LIST: '%s'-size='%d'-----\n", ObjectManager::OMListToString((OM_LIST) omList), this->objectLists[omList].size());
     std::list<WorldEntity*>::const_iterator entity;
     for (entity = this->objectLists[omList].begin(); entity != this->objectLists[omList].end(); entity++)
@@ -150 +168 @@
 const char* ObjectManager::OMListToString(OM_LIST omList)
 {
+  if (omList == OM_INIT || omList == OM_SIZE)
+    return "===invalid===";
+
   return ObjectManager::objectManagerListNames[omList];
 }

branches/objectmanager/src/util/object_manager.h

@@ -73 +73 @@
   inline static ObjectManager* getInstance(void) { if (!ObjectManager::singletonRef) ObjectManager::singletonRef = new ObjectManager();  return ObjectManager::singletonRef; }
 
+  void flush();
 
   void toList (WorldEntity* entity, OM_LIST omList = OM_DEFAULT_LIST);