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

Timestamp:

Jun 11, 2005, 12:55:48 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: setClassID implemented in all files

Location:

orxonox/trunk/src/story_entities

Files:

• campaign.cc (modified) (15 diffs)
• campaign.h (modified) (1 diff)
• story_def.h (modified) (1 diff)
• story_entity.cc (modified) (1 diff)
• story_entity.h (modified) (1 diff)
• world.cc (modified) (1 diff)

orxonox/trunk/src/story_entities/campaign.cc

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: 
+   co-programmer:
 */
 
@@ -32 +32 @@
 
 
-Campaign::Campaign () 
-{
+Campaign::Campaign ()
+{
+  this->setClassID(CL_CAMPAIGN, "Campaign");
   this->entities = new tList<StoryEntity>();
   this->isInit = false;
 }
 
-Campaign::Campaign ( TiXmlElement* root) 
-{
+Campaign::Campaign ( TiXmlElement* root)
+{
+  //! \todo loading with load_param....
+  this->setClassID(CL_CAMPAIGN, "Campaign");
   TiXmlElement* element;
   const char* string;
   int id;
-  
+
   PRINTF(3)("Loading Campaign...\n");
-  
+
   assert( root != NULL);
   GameLoader* loader = GameLoader::getInstance();
-  
+
   this->entities = new tList<StoryEntity>();
   this->isInit = false;
-  
+
   // grab all the necessary parameters
   string = grabParameter( root, "identifier");
@@ -60 +63 @@
     }
   else this->setStoryID( id);
-  
+
   // find WorldList
   element = root->FirstChildElement( "WorldList");
@@ -69 +72 @@
   else
     element = element->FirstChildElement();
-  
+
   // load Worlds/Subcampaigns/Whatever
   StoryEntity* lastCreated = NULL;
@@ -77 +80 @@
       StoryEntity* created = (StoryEntity*) loader->fabricate( element);
       /*
-      if( lastCreated != NULL) 
-        created->setNextStoryID( lastCreated->getStoryID());
+      if( lastCreated != NULL)
+        created->setNextStoryID( lastCreated->getStoryID());
       else
-        created->setNextStoryID( WORLD_ID_GAMEEND);
+        created->setNextStoryID( WORLD_ID_GAMEEND);
       */
       if( created != NULL)
-        {
-          this->addEntity( created);    
-          lastCreated = created;
-        }
+        {
+          this->addEntity( created);
+          lastCreated = created;
+        }
       element = element->NextSiblingElement();
     }
-  //if( lastCreated != NULL) 
+  //if( lastCreated != NULL)
   //lastCreated->setStoryID( WORLD_ID_GAMEEND);
 }
@@ -111 +114 @@
 {
   ErrorMessage errorCode;
-  if( !this->isInit) return errorCode; 
+  if( !this->isInit) return errorCode;
   if( storyID == WORLD_ID_GAMEEND) return errorCode;
   this->running = true;
@@ -126 +129 @@
       se->start();
       se->destroy();
-     
+
       delete se;
 
@@ -133 +136 @@
       se = this->getStoryEntity(nextWorldID);
       this->currentEntity = se;
-      if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) ) 
-        {
-          PRINTF(0)("Quitting campaing story loop\n");
-          if(se != NULL)
-            delete se;
-          return errorCode;
-        }
-      
+      if( ( nextWorldID == WORLD_ID_GAMEEND) ||( se == NULL) )
+        {
+          PRINTF(0)("Quitting campaing story loop\n");
+          if(se != NULL)
+            delete se;
+          return errorCode;
+        }
+
     }
 }
@@ -162 +165 @@
 {
   this->running = false;
-  if(this->currentEntity != NULL) 
+  if(this->currentEntity != NULL)
     {
       this->currentEntity->stop();
@@ -182 +185 @@
 
 
-/** 
+/**
     \brief adds an game stroy entity to the campaign
 
@@ -206 +209 @@
 {
   this->removeEntity(this->getStoryEntity(storyID));
-  
+
 }
 
@@ -251 +254 @@
   tList<StoryEntity>* l;
   StoryEntity* entity = NULL;
-  l = this->entities->getNext();  
-  while( l != NULL) 
-    { 
+  l = this->entities->getNext();
+  while( l != NULL)
+    {
       entity = l->getObject();
       l = l->getNext();
@@ -260 +263 @@
       //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;
-        }
+        {
+          //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
+          return entity;
+        }
 
     }
@@ -271 +274 @@
   tIterator<StoryEntity>* iterator = this->entities->getIterator();
   StoryEntity* entity = iterator->nextElement();
-  while( entity != NULL) 
-    { 
+  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;
-        }
+        {
+          //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
+          return entity;
+        }
       entity = iterator->nextElement();
     }

orxonox/trunk/src/story_entities/campaign.h

@@ -32 +32 @@
   void removeEntity(int storyID);
   void removeEntity(StoryEntity* se);
-  
+
   void nextLevel();
   void previousLevel();

orxonox/trunk/src/story_entities/story_def.h

@@ -20 +20 @@
 #define WORLD_ID_GAMEEND 999
 
-#define MAX_STORY_ENTITIES 99 //!> maximal StoryEntities in a Campaign
+#define MAX_STORY_ENTITIES 99 //!< maximal StoryEntities in a Campaign
 
 #endif /* _STORY_DEF_H */

orxonox/trunk/src/story_entities/story_entity.cc

@@ -26 +26 @@
 StoryEntity::StoryEntity ()
 {
-  this->setClassID(CL_STORY_ENTITY);
+  this->setClassID(CL_STORY_ENTITY, "StoryEntity");
 }
 StoryEntity::~StoryEntity () {}

orxonox/trunk/src/story_entities/story_entity.h

@@ -1 @@
-/*! 
+/*!
     \file story_entity.h
     \brief holds the base class of everything that is playable - that is part of the story
-*/ 
+*/
 
 

orxonox/trunk/src/story_entities/world.cc

@@ -769 +769 @@
   //GLMenuImageScreen*
   this->glmis = new GLMenuImageScreen();
-  this->glmis->init();
   this->glmis->setMaximum(8);
-  //  this->glmis->draw();
 
   PRINTF(3)("World::displayLoadScreen - end\n");