Changeset 5773 in orxonox.OLD

Timestamp:

Nov 25, 2005, 1:07:55 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: changed to std::list in campaign

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (8 diffs)
• campaign.h (modified) (2 diffs)

trunk/src/story_entities/campaign.cc

@@ -25 +25 @@
 #include "camera.h"
 
-#include "list.h"
-
 #include "load_param.h"
 
@@ -36 +34 @@
 {
   this->setClassID(CL_CAMPAIGN, "Campaign");
-  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 }
@@ -48 +45 @@
   assert( root != NULL);
 
-  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 
@@ -130 +126 @@
       int nextWorldID = se->getNextStoryID();
 
-      this->entities->remove(se);
+      this->entities.remove(se);
       delete se;
 
@@ -148 +144 @@
        this probably does not belong into the start function. remove this later
     */
-    tIterator<StoryEntity>* it = this->entities->getIterator();
-    se = it->firstElement();
-    while( se != NULL)
-    {
-      delete se;
-      se = it->nextElement();
-    }
-    delete this->entities;
-    delete it;
+    list<StoryEntity*>::iterator it;
+    for(it = this->entities.begin(); it != entities.end(); it++)
+    {
+      delete (*it);
+    }
 }
 
@@ -212 +204 @@
 void Campaign::addEntity(StoryEntity* se)
 {
-  this->entities->add(se);
+  this->entities.push_back(se);
 }
 
@@ -225 +217 @@
 void Campaign::removeEntity(StoryEntity* se)
 {
-  this->entities->remove(se);
+  this->entities.remove(se);
 }
 
@@ -279 +271 @@
 
 
-  tIterator<StoryEntity>* iterator = this->entities->getIterator();
-  StoryEntity* entity = iterator->firstElement();
-  while( entity != NULL)
-    {
-      int id = entity->getStoryID();
+  list<StoryEntity*>::iterator it;
+  for (it = this->entities.begin(); it != this->entities.end(); it++)
+  {
+      int id = (*it)->getStoryID();
       //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
       if(id == storyID)
         {
           //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
-          delete iterator;
-          return entity;
+          return (*it);
         }
-      entity = iterator->nextElement();
-    }
-  delete iterator;
+    }
+
 
 

trunk/src/story_entities/campaign.h

@@ -5 +5 @@
 #include "stdincl.h"
 #include "story_entity.h"
-
+#include <list>
 
 class World;
 class TiXmlElement;
-template<class T> class tList;
 
 class Campaign : public StoryEntity {
@@ -41 +40 @@
  private:
   //ListTemplate<StoryEntity>* entities;
-  tList<StoryEntity>* entities;
-  bool running;
+   std::list<StoryEntity*> entities;
+   bool running;
 
-  StoryEntity* getStoryEntity(int storyID);
+   StoryEntity* getStoryEntity(int storyID);
 };