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

Timestamp:

Aug 24, 2005, 1:30:13 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: reimplemented the list functions, as i did before in revision 5110.
This time, i looked out for the bugs, and i think i found one

@patrick: i know, that you do not want to code at the moment… :/ → see mail

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (2 diffs)
• world.cc (modified) (6 diffs)

trunk/src/story_entities/campaign.cc

@@ -154 +154 @@
     */
     tIterator<StoryEntity>* it = this->entities->getIterator();
-    se = it->nextElement();
+    se = it->firstElement();
     while( se != NULL)
     {
@@ -284 +284 @@
 
   tIterator<StoryEntity>* iterator = this->entities->getIterator();
-  StoryEntity* entity = iterator->nextElement();
+  StoryEntity* entity = iterator->firstElement();
   while( entity != NULL)
     {

trunk/src/story_entities/world.cc

@@ -118 +118 @@
   PRINTF(3)("World::~World() - deleting current world\n");
 
-  ParticleEngine::getInstance()->debug();
-
   // here everything that is alocated by the World is deleted
   delete this->entities;
   State::setWorldEntityList(NULL);
+
 
   delete LightManager::getInstance();
@@ -135 +134 @@
   FastFactory::flushAll(true);
 
+
   // erease everything that is left.
   delete NullParent::getInstance();
@@ -140 +140 @@
 
   // unload the resources !!
-  ResourceManager::getInstance()->unload(this->music);
+//  ResourceManager::getInstance()->unload(this->music);
   ResourceManager::getInstance()->unloadAllByPriority(RP_LEVEL);
 }
@@ -761 +761 @@
 void World::debug()
 {
+  PRINTF(0)("Printing out the List of alive WorldEntities:\n");
+  tIterator<WorldEntity>* iterator = this->entities->getIterator();
+  WorldEntity* entity = iterator->firstElement();
+  while( entity != NULL)
+  {
+    PRINTF(0)("%s::%s\n", entity->getClassName(), entity->getName());
+    entity = iterator->nextElement();
+  }
+  delete iterator;
 }
 
@@ -864 +873 @@
 
       tIterator<WorldEntity>* iterator = this->entities->getIterator();
-      WorldEntity* entity = iterator->nextElement();
+      WorldEntity* entity = iterator->firstElement();
       while( entity != NULL)
         {
@@ -951 +960 @@
   glLoadIdentity();
   tIterator<WorldEntity>* iterator = this->entities->getIterator();
-  entity = iterator->nextElement();
+  entity = iterator->firstElement();
   while( entity != NULL )
   {