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

Timestamp:

Mar 20, 2005, 11:37:26 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now there is a real speedup in compiling time when dependencies are modified: just realy only includes, what is needed. Byside the speedup, there is more overview! never add an orxonox class to stdincl.h if it doesn't have to be

Location:

orxonox/trunk/src/story_entities

Files:

• campaign.cc (modified) (5 diffs)
• campaign.h (modified) (2 diffs)
• story_entity.h (modified) (1 diff)
• world.cc (modified) (1 diff)
• world.h (modified) (1 diff)

orxonox/trunk/src/story_entities/campaign.cc

@@ -20 +20 @@
 #include "world.h"
 #include "camera.h"
-#include "story_entity.h"
+//#include "story_entity.h"
+#include "list.h"
 
 using namespace std;
@@ -27 +28 @@
 Campaign::Campaign () 
 {
-  this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 }
@@ -184 +185 @@
   if( storyID == WORLD_ID_GAMEEND)
     return NULL;
-  ListTemplate<StoryEntity>* l;
+
+  /*
+  tList<StoryEntity>* l;
   StoryEntity* entity = NULL;
   l = this->entities->getNext();  
@@ -191 +194 @@
       entity = l->getObject();
       l = l->getNext();
+
       int id = entity->getStoryID();
       //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
@@ -198 +202 @@
           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;
 }

orxonox/trunk/src/story_entities/campaign.h

@@ -8 +8 @@
 
 class World;
+template<class T> class tList;
 
 class Campaign : public StoryEntity {
@@ -34 +35 @@
 
  private:
-  ListTemplate<StoryEntity>* entities;
+  //ListTemplate<StoryEntity>* entities;
+  tList<StoryEntity>* entities;
   bool running;
 

orxonox/trunk/src/story_entities/story_entity.h

@@ -8 +8 @@
 #define _STORY_ENTITY_H
 
-#include "stdincl.h"
+#include "base_object.h"
 #include "story_def.h"
+#include "error.h"
+
 
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...

orxonox/trunk/src/story_entities/world.cc

@@ -18 +18 @@
 
 #include "world.h"
+
+#include "orxonox.h"
+#include "p_node.h"
+#include "null_parent.h"
+#include "helper_parent.h"
+#include "track_node.h"
 #include "world_entity.h"
 #include "track_manager.h"
 #include "player.h"
-#include "command_node.h"
 #include "camera.h"
 #include "environment.h"
 #include "primitive.h"
-#include "p_node.h"
-#include "null_parent.h"
-#include "helper_parent.h"
+#include "skysphere.h"
+#include "terrain.h"
+#include "light.h"
+#include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "skysphere.h"
-#include "light.h"
 #include "fontset.h"
-#include "track_node.h"
-#include "terrain.h"
+#include "list.h"
+
+
 
 using namespace std;

orxonox/trunk/src/story_entities/world.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+#include "comincl.h"
 #include "story_entity.h"
 #include "p_node.h"