Changeset 4816 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Jul 7, 2005, 4:24:58 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the story entities now get deleted properly on shutdown

File:

• orxonox/trunk/src/story_entities/campaign.cc (modified) (5 diffs)

orxonox/trunk/src/story_entities/campaign.cc

@@ -57 +57 @@
 }
 
-Campaign::~Campaign () {}
+Campaign::~Campaign ()
+{}
 
 
@@ -133 +134 @@
       se->destroy();
 
+      this->entities->remove(se);
       delete se;
 
@@ -146 +148 @@
           return errorCode;
         }
-
-    }
+    }
+
+    /* clean up all world that have not been loaded and therefore are still in the world list  -
+       this probably does not belong into the start function. remove this later
+    */
+    tIterator<StoryEntity>* it = this->entities->getIterator();
+    se = it->nextElement();
+    while( se != NULL)
+    {
+      delete se;
+      se = it->nextElement();
+    }
+    delete this->entities;
 }
 
@@ -171 +184 @@
     {
       this->currentEntity->stop();
-      //delete this->currentEntity;
-      //this->currentEntity = NULL;
     }
 }
@@ -228 +239 @@
 {
   printf("Campaign:nextLevel()\n");
-  //int nextID = this->currentEntity->getNextStoryID();
-  //this->stop();
-  //this->start(nextID);
   this->currentEntity->stop();
 }