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

Timestamp:

Feb 2, 2006, 2:45:07 PM (19 years ago)

Author:

bensch

Message:

trunk: some virtuals

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world_data.cc (modified) (1 diff)
• simple_game_menu.h (modified) (1 diff)

trunk/src/story_entities/game_world.cc

@@ -190 +190 @@
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
+  this->dataTank->unloadData();
+
   if (this->dataXML)
     delete this->dataXML;
 
-  this->dataTank->unloadData();
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -247 +247 @@
   // erease everything that is left.
   // delete PNode::getNullParent(); // not needed as this is also done in the next step (and also much cleaner)
-
+  const std::list<BaseObject*>* nodeList;
   //secondary cleanup of PNodes;
-  const std::list<BaseObject*>* nodeList = ClassList::getList(CL_PARENT_NODE);
+  nodeList = ClassList::getList(CL_PARENT_NODE);
   if (nodeList != NULL)
     while (!nodeList->empty())
       delete nodeList->front();
-
   /* remove the player object */
   if( this->localPlayer)
     delete this->localPlayer;
+
+//   nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);
+//   if (nodeList != NULL)
+//     while (!nodeList->empty())
+//       delete nodeList->front();
+//
+//   nodeList = ClassList::getList(CL_ELEMENT_2D);
+//   if (nodeList != NULL)
+//     while (!nodeList->empty())
+//       delete nodeList->front();
+
+
+
 
   // unload the resources !!

trunk/src/story_entities/simple_game_menu.h

@@ -25 +25 @@
   public:
     MenuLayer() {}
-    ~MenuLayer() {}
+    virtual ~MenuLayer() {}