Changeset 4816 in orxonox.OLD

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

Location:

orxonox/trunk/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• story_entities/campaign.cc (modified) (5 diffs)
• util/loading/game_loader.cc (modified) (3 diffs)

orxonox/trunk/src/lib/event/event_handler.cc

@@ -146 +146 @@
 void EventHandler::unsubscribe(EventListener* el, elState state)
 {
+  if( el == NULL)
+    return;
   if( state == ES_ALL)
     {

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

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

@@ -49 +49 @@
    \brief simple deconstructor
 */
-GameLoader::~GameLoader () {}
+GameLoader::~GameLoader ()
+{
+  if( this->currentCampaign)
+    delete this->currentCampaign;
+  this->currentCampaign = NULL;
+}
 
 
@@ -97 +102 @@
       delete campaignName;
     }
-  World* world0 = new World(DEBUG_WORLD_0);
-  world0->setNextStoryID(WORLD_ID_GAMEEND);
-  this->currentCampaign->addEntity(world0, WORLD_ID_2);
+//   World* world0 = new World(DEBUG_WORLD_0);
+//   world0->setNextStoryID(WORLD_ID_GAMEEND);
+//   this->currentCampaign->addEntity(world0, WORLD_ID_2);
 }
 
@@ -165 +170 @@
   if(this->currentCampaign != NULL)
     this->currentCampaign->stop();
-  this->currentCampaign = NULL;
 }