Changeset 6374 in orxonox.OLD

Timestamp:

Dec 31, 2005, 3:53:45 PM (18 years ago)

Author:

patrick

Message:

network: single player loads again, many changes in the function bodies of the loading code

Location:

branches/network/src/story_entities

Files:

• campaign.cc (modified) (6 diffs)
• campaign.h (modified) (2 diffs)
• game_world.cc (modified) (2 diffs)
• single_player_world.cc (modified) (2 diffs)
• single_player_world.h (modified) (1 diff)
• story_entity.h (modified) (2 diffs)

branches/network/src/story_entities/campaign.cc

@@ -25 +25 @@
 
 
-Campaign::Campaign ()
+/**
+ *  the constructor
+ * @param root the XML root element
+ *
+ * this constructor is always called in a XML context (loading procedure)
+ */
+Campaign::Campaign ( TiXmlElement* root)
 {
   this->setClassID(CL_CAMPAIGN, "Campaign");
   this->isInit = false;
-}
-
-Campaign::Campaign ( TiXmlElement* root)
-{
-  this->setClassID(CL_CAMPAIGN, "Campaign");
 
   PRINTF(4)("Loading Campaign...\n");
-
   assert( root != NULL);
 
-  this->isInit = false;
-
   this->loadParams(root);
-
-
-  //if( lastCreated != NULL)
-  //lastCreated->setStoryID( WORLD_ID_GAMEEND);
-}
-
+}
+
+
+/**
+ * the campaign destructor
+ */
 Campaign::~Campaign ()
 {}
@@ -70 +68 @@
 
   LoadParam(root, "identifier", this, Campaign, setStoryID)
-     .describe("A Unique Identifier for this Campaign");
-
-   LoadParamXML(root, "WorldList", this, Campaign, loadWorldListParams)
-      .describe("A List of Worlds to be loaded in this Campaign");
+  .describe("A Unique Identifier for this Campaign");
+
+  LoadParamXML(root, "WorldList", this, Campaign, loadWorldListParams)
+  .describe("A List of Worlds to be loaded in this Campaign");
 }
 
@@ -83 +81 @@
 void Campaign::loadWorldListParams(const TiXmlElement* root)
 {
-  if (root == NULL)
+  if( root == NULL)
     return;
 
   LOAD_PARAM_START_CYCLE(root, element);
   {
-    PRINTF(5)("Campaign: Constructor: adding a world\n");
     StoryEntity* created = (StoryEntity*) Factory::fabricate(element);
     if( created != NULL)
-    {
       this->addEntity( created);
-    }
+    PRINTF(3)("Campaign: Constructor: adding a world with name \"%s\" and id %i\n",
+              created->getName(), created->getStoryID());
   }
   LOAD_PARAM_END_CYCLE(element);
-}
+
+}
+
 
 /**
@@ -120 +119 @@
   this->currentEntity = se;
   while( se != NULL && this->running)
+  {
+    PRINTF(0)("Campaign is starting StoryEntity nr:%i\n", se->getStoryID());
+
+    se->init();
+    se->loadData();
+
+    se->preStart();
+    se->start();
+
+
+    int nextWorldID = se->getNextStoryID();
+
+    this->entities.remove(se);
+    delete se;
+
+    se = this->getStoryEntity(nextWorldID);
+    this->currentEntity = se;
+    if( ( nextWorldID == WORLD_ID_GAMEEND) || ( se == NULL) )
     {
-      PRINTF(0)("Starting new StoryEntity Nr:%i\n", se->getStoryID());
-
-      se->init();
-
-      //se->preLoad();
-      se->loadData();
-      //se->postLoad();
-
-
-      se->preStart();
-      se->start();
-
-      int nextWorldID = se->getNextStoryID();
-
-      this->entities.remove(se);
-      delete se;
-
-      //printf("Campaing::start() - got nextWorldID = %i\n", nextWorldID);
-      se = this->getStoryEntity(nextWorldID);
-      this->currentEntity = se;
-      if( ( nextWorldID == WORLD_ID_GAMEEND) || ( se == NULL) )
-        {
-          PRINTF(4)("Quitting campaing story loop\n");
-          if(se != NULL)
-            delete se;
-          return errorCode;
-        }
+      PRINTF(4)("Quitting campaing story loop\n");
+      if(se != NULL)
+        delete se;
+      return errorCode;
     }
-
-    /* clean up all world that have not been loaded and therefore are still in the world list  -
-       this probably does not belong into the start function. remove this later
-    */
-    list<StoryEntity*>::iterator it;
-    for(it = this->entities.begin(); it != entities.end(); it++)
-    {
-      delete (*it);
-    }
-    PRINTF(1)("There is no StoryEnity left to play, quitting\n");
+  }
+
+  /* clean up all world that have not been loaded and therefore are still in the world list  -
+     this probably does not belong into the start function. remove this later
+  */
+  list<StoryEntity*>::iterator it;
+  for(it = this->entities.begin(); it != entities.end(); it++)
+  {
+    delete (*it);
+  }
+
+  PRINTF(2)("There is no StoryEnity left to play, quitting\n");
 }
 
@@ -183 +179 @@
   this->running = false;
   if(this->currentEntity != NULL)
-    {
-      this->currentEntity->stop();
-    }
+  {
+    this->currentEntity->stop();
+  }
 }
 
@@ -259 +255 @@
 StoryEntity* Campaign::getStoryEntity(int storyID)
 {
-  //printf("Campaing::getStoryEntity(%i) - getting next Entity\n", storyID);
   if( storyID == WORLD_ID_GAMEEND)
     return NULL;
 
-  /*
-  tList<StoryEntity>* l;
-  StoryEntity* entity = NULL;
-  l = this->entities->getNext();
-  while( l != NULL)
-    {
-      entity = l->getObject();
-      l = l->getNext();
-
-      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;
-        }
-
-    }
-  */
-
-
+  int id;
   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");
-          return (*it);
-        }
-    }
-
-
+  for( it = this->entities.begin(); it != this->entities.end(); it++)
+  {
+    id = (*it)->getStoryID();
+    if( id == storyID)
+      return (*it);
+  }
 
   return NULL;

branches/network/src/story_entities/campaign.h

@@ -14 +14 @@
 
   public:
-    Campaign ();
-    Campaign ( TiXmlElement* root);
+    Campaign( TiXmlElement* root);
     virtual ~Campaign ();
 
@@ -48 +47 @@
 };
 
+
+
+class CampaignData : virtual public BaseObject
+{
+
+  public:
+    CampaignData();
+    virtual ~CampaignData();
+
+    void addStoryEntity(StoryEntity* se, int storyID = -1);
+
+    void getNextLevel();
+};
+
 #endif /* _CAMPAIGN_H */

branches/network/src/story_entities/game_world.cc

@@ -82 +82 @@
 
 GameWorld::GameWorld(const TiXmlElement* root)
+  : StoryEntity()
 {
   this->setClassID(CL_GAME_WORLD, "GameWorld");
@@ -97 +98 @@
 
   this->path = NULL;
-
-  this->loadParams(root);
 }
 

branches/network/src/story_entities/single_player_world.cc

@@ -38 +38 @@
   : GameWorld(root)
 {
+  this->setClassID(CL_SINGLE_PLAYER_WORLD, "SinglePlayerSinglePlayerWorld");
+  this->setName("SinglePlayerWorld uninitialized");
+
   this->loadParams(root);
 }
@@ -51 +54 @@
 {
   PRINTF(3)("SinglePlayerWorld::~SinglePlayerWorld() - deleting current world\n");
-}
-
-
-/**
- * initializes the world.
- * @param name the name of the world
- * @param worldID the ID of this world
- *
- * set all stuff here that is world generic and does not use to much memory
- * because the real init() function StoryEntity::init() will be called
- * shortly before start of the game.
- * since all worlds are initiated/referenced before they will be started.
- * NO LEVEL LOADING HERE - NEVER!
-*/
-void SinglePlayerWorld::constuctorInit(const char* name, int worldID)
-{
-  this->setClassID(CL_SINGLE_PLAYER_WORLD, "SinglePlayerSinglePlayerWorld");
-  this->setName(name);
-
-  this->gameTime = 0.0f;
-  this->setSpeed(1.0);
-  this->music = NULL;
-  this->shell = NULL;
-  this->localPlayer = NULL;
-  this->localCamera = NULL;
-
-  this->showPNodes = false;
-  this->showBV = false;
 }
 

branches/network/src/story_entities/single_player_world.h

@@ -28 +28 @@
 
   private:
-    void constuctorInit(const char* name, int worldID);
+
 };
 

branches/network/src/story_entities/story_entity.h

@@ -18 +18 @@
   StoryEntity ();
   virtual ~StoryEntity ();
+
+  void loadParams(const TiXmlElement* root);
 
   /* initialisation and loading */
@@ -47 +49 @@
   inline void setStoryID(int storyID) { this->storyID = storyID; }
   /** sets the story id of the current entity, this enables it to be identified in a  global context. @returns  the story id  */
-  inline int getStoryID() { this->storyID = storyID; }
+  inline int getStoryID() { return this->storyID; }
   /**  sets the id of the next story entity: StoryEntities can choose their following entity themselfs.
    * the entity id defined here  will be startet after this entity ends. this can be convenient if you