Changeset 7126 in orxonox.OLD for trunk/src/story_entities/game_world_data.cc

Timestamp:

Feb 13, 2006, 1:14:53 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the delete Mechanism of PNode seems to work again.
This is done by always deleting the first node, and not walking through a list, that is eleminated during deletion time

File:

• trunk/src/story_entities/game_world_data.cc (modified) (2 diffs)

trunk/src/story_entities/game_world_data.cc

@@ -252 +252 @@
   FastFactory::flushAll(true);
   GraphicsEngine::getInstance()->displayFPS(false);
-  State::setPlayer(NULL);
   // erease everything that is left.
   // delete PNode::getNullParent(); // not needed as this is also done in the next step (and also much cleaner)
@@ -261 +260 @@
     while (!nodeList->empty())
   {
-    ClassList::debug( 3, CL_PARENT_NODE);
-    PNode::getNullParent()->debugNode( 1);
-
-/*    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());*/
+//    ClassList::debug( 3, CL_PARENT_NODE);
+//    PNode::getNullParent()->debugNode(0);
+//    printf("%s::%s\n", nodeList->front()->getClassName(), nodeList->front()->getName());
     delete nodeList->front();
-    printf("OK\n");
   }
   /* remove the player object */
   if( this->localPlayer)
     delete this->localPlayer;
+  State::setPlayer(NULL);
 
   nodeList = ClassList::getList(CL_GRAPHICS_EFFECT);