Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/story_entities/campaign.cc

Timestamp:

Apr 7, 2005, 3:54:49 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/story_entities/campaign.cc (modified) (7 diffs)

orxonox/branches/levelloader/src/story_entities/campaign.cc

@@ -18 +18 @@
 
 #include "campaign.h"
+
+#include "story_entity.h"
+
 #include "world.h"
 #include "camera.h"
-#include "story_entity.h"
 #include "factory.h"
 #include "game_loader.h"
 
+#include "list.h"
+
 using namespace std;
 
@@ -30 +34 @@
 Campaign::Campaign () 
 {
-  this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 }
+
 
 Campaign::~Campaign () {}
@@ -47 +52 @@
         GameLoader* loader = GameLoader::getInstance();
         
-  this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
   
@@ -106 +111 @@
     {
       se->displayLoadScreen();
+      se->preLoad();
       se->load();
       se->init();
@@ -232 +238 @@
   if( storyID == WORLD_ID_GAMEEND)
     return NULL;
-  ListTemplate<StoryEntity>* l;
+
+  /*
+  tList<StoryEntity>* l;
   StoryEntity* entity = NULL;
   l = this->entities->getNext();  
@@ -239 +247 @@
       entity = l->getObject();
       l = l->getNext();
+
       int id = entity->getStoryID();
       //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
@@ -246 +255 @@
           return entity;
         }
-    }
+
+    }
+  */
+
+
+
+  StoryEntity* entity = this->entities->enumerate();
+  while( entity != NULL) 
+    { 
+      int id = entity->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");
+          return entity;
+        }
+      entity = this->entities->nextElement();
+    }
+
+
+
   return NULL;
 }