Changeset 3220 in orxonox.OLD for orxonox/trunk/src/campaign.cc

Timestamp:

Dec 19, 2004, 9:09:36 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed a lot of bugs with StoryEntity management, also cleared up some old unused code

File:

• orxonox/trunk/src/campaign.cc (modified) (8 diffs)

orxonox/trunk/src/campaign.cc

@@ -48 +48 @@
     want to queue up in the campaign.
 */
-void Campaign::addEntity(StoryEntity* se, Uint32 storyID)
+void Campaign::addEntity(StoryEntity* se, int storyID)
 {
   se->setStoryID(storyID);
@@ -60 +60 @@
 
 
-void Campaign::removeEntity(Uint32 storyID)
+void Campaign::removeEntity(int storyID)
 {
   this->removeEntity(this->getStoryEntity(storyID));
@@ -78 +78 @@
 }
 
-Error Campaign::start(Uint32 storyID = 0)
+Error Campaign::start(int storyID = 0)
 {
   printf("World::start() - starting new StoryEntity Nr:%i\n", storyID);
@@ -86 +86 @@
   this->running = true;
   StoryEntity* se = this->getStoryEntity(storyID);
+  this->currentEntity = se;
   while(se != NULL && this->running)
     {
-      se = this->getStoryEntity(storyID);
-      this->currentEntity = se;
+      //se = this->getStoryEntity(storyID);
       
-      se->displayEntityScreen();
+      
+      se->displayLoadScreen();
       se->load();
       se->init();
-      se->releaseEntityScreen();
+      se->releaseLoadScreen();
       se->start();
 
+      delete se;
+
       int nextWorldID = se->getNextStoryID();
-      if(nextWorldID == WORLD_ID_GAMEEND) return errorCode;
+      //printf("Campaing::start() - got nextWorldID = %i\n", nextWorldID);
       se = this->getStoryEntity(nextWorldID);
-      if(se == NULL)
-        printf("Campaign::start() - ERROR: world not found, oh oh...\n");
+      this->currentEntity = se;
+      if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) ) 
+        {
+          printf("Campaign::start() - quiting campaing story loop\n");
+          if(se != NULL)
+            delete se;
+          return errorCode;
+        }
+      
     }
 }
@@ -111 +121 @@
     {
       this->currentEntity->stop();
-      delete this->currentEntity;
-      this->currentEntity = NULL;
+      //delete this->currentEntity;
+      //this->currentEntity = NULL;
     }
 }
@@ -130 +140 @@
 
 
+void Campaign::destroy()
+{
+  if(this->currentEntity != NULL)
+    {
+      this->currentEntity->destroy();
+      delete this->currentEntity;
+      this->currentEntity = NULL;
+    }
+}
+
 void Campaign::nextLevel()
 {
-  printf("Campaign|nextLevel\n");
-  int nextID = this->currentEntity->getNextStoryID();
-  this->stop();
-  this->start(nextID);
+  printf("Campaign:nextLevel()\n");
+  //int nextID = this->currentEntity->getNextStoryID();
+  //this->stop();
+  //this->start(nextID);
+  this->currentEntity->stop();
 }
 
@@ -142 +163 @@
 
 
-StoryEntity* Campaign::getStoryEntity(Uint32 storyID)
+StoryEntity* Campaign::getStoryEntity(int storyID)
 {
+  //printf("Campaing::getStoryEntity(%i) - getting next Entity\n", storyID);
+  if( storyID == WORLD_ID_GAMEEND)
+    return NULL;
   ListTemplate<StoryEntity>* l;
-  StoryEntity* entity;
+  StoryEntity* entity = NULL;
   l = this->entities->get_next();  
   while( l != NULL) 
@@ -151 +175 @@
       entity = l->get_object();
       l = l->get_next();
-      if(entity->getStoryID() == storyID)
-        return entity;
+      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;
+        }
     }
   return NULL;