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

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/util/loading/game_loader.cc (modified) (3 diffs)

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