Changeset 7029 in orxonox.OLD for trunk

Timestamp:

Feb 3, 2006, 9:16:07 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: element2d's should be cleanly deleted at the end now

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (2 diffs)
• story_entities/simple_game_menu.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -102 +102 @@
 {
   // delete what has to be deleted here
-  delete this->geTextCFPS;
-  delete this->geTextMaxFPS;
-  delete this->geTextMinFPS;
+  this->displayFPS( false );
 
   delete[] this->hwRenderer;

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -87 +87 @@
 Element2D::~Element2D ()
 {
+  this->debug();
   // remove the Element2D, delete it's children (if required).
   std::list<Element2D*>::iterator tmp = this->children.begin();

trunk/src/story_entities/game_world.cc

@@ -191 +191 @@
   if (this->dataXML)
     delete this->dataXML;
-
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -246 +246 @@
 {
   FastFactory::flushAll(true);
+  GraphicsEngine::getInstance()->displayFPS(false);
 
   // erease everything that is left.
@@ -263 +264 @@
     while (!nodeList->empty())
       delete nodeList->front();
-  //
-  //   nodeList = ClassList::getList(CL_ELEMENT_2D);
-  //   if (nodeList != NULL)
-  //     while (!nodeList->empty())
-  //       delete nodeList->front();
+
+
+  nodeList = ClassList::getList(CL_ELEMENT_2D);
+    if (nodeList != NULL)
+       while (!nodeList->empty())
+         delete nodeList->front();
 
 

trunk/src/story_entities/simple_game_menu.cc

@@ -242 +242 @@
 ErrorMessage SimpleGameMenu::unloadData()
 {
-  GameWorld::unloadData();
 
   EventHandler::getInstance()->unsubscribe(this, ES_MENU);
@@ -259 +258 @@
     (*mit).screenshootList.clear();
   }
+
+
+  GameWorld::unloadData();
 }