Changeset 3557 in orxonox.OLD for orxonox/branches/levelloader/src/story_entities

Timestamp:

Mar 15, 2005, 10:53:46 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Rolling toward bug-free-ness

Location:

orxonox/branches/levelloader/src/story_entities

Files:

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

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

@@ -42 +42 @@
         int id;
         
+        PRINTF0("Loading Campaign...\n");
+        
         assert( root != NULL);
         GameLoader* loader = GameLoader::getInstance();
@@ -52 +54 @@
         if( string == NULL || sscanf(string, "%d", &id) != 1)
         {
-                PRINTF(1)("Campaign is missing a proper 'identifier'\n");
+                PRINTF0("Campaign is missing a proper 'identifier'\n");
                 this->setStoryID( -1);
         }
@@ -59 +61 @@
   // find WorldList
   element = root->FirstChildElement( "WorldList");
+  if( element == NULL)
+  {
+                PRINTF0("Campaign is missing a proper 'WorldList'\n");
+  }
+  else
+        element = element->FirstChildElement();
   
   // load Worlds/Subcampaigns/Whatever
@@ -81 +89 @@
 }
 
-
-ErrorMessage Campaign::start()
-{
-  this->start(0);
-}
-
-
-ErrorMessage Campaign::start(int storyID = 0)
-{
-  printf("World::start() - starting new StoryEntity Nr:%i\n", storyID);
+ErrorMessage Campaign::start(int storyID)
+{
+  printf("Camapaign::start() - starting new StoryEntity Nr:%i\n", storyID);
   ErrorMessage errorCode;
   if( !this->isInit) return errorCode; 
@@ -97 +98 @@
   StoryEntity* se = this->getStoryEntity(storyID);
   this->currentEntity = se;
+  if( se == NULL)
+  {
+        printf("Camapaign::start() - Start StoryEntity not found\n");
+        return errorCode;
+  }
   while( se != NULL && this->running)
     {

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

@@ -19 +19 @@
 
   virtual ErrorMessage init();
-  virtual ErrorMessage start();
-  virtual ErrorMessage start(int storyID);
+  virtual ErrorMessage start(int storyID = 0);
   virtual ErrorMessage pause();
   virtual ErrorMessage resume();

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

@@ -68 +68 @@
         
         localPlayer = NULL;
+  this->entities = new tList<WorldEntity>();
                 
 }
@@ -142 +143 @@
 {
         
-        PRINTF0("Loading world: '%s'\n", getPath());
+        PRINTF0("> Loading world: '%s'\n", getPath());
         
         GameLoader* loader = GameLoader::getInstance();
@@ -166 +167 @@
         assert( root != NULL);
         
-        TiXmlElement* element = root->FirstChildElement( "WorldDataFile");
-        
-        if( root == NULL )
+        if( root == NULL || root->Value() == NULL || strcmp( root->Value(), "WorldDataFile"))
         {
                 // report an error
@@ -197 +196 @@
         
         // find WorldEntities
-  element = root->FirstChildElement( "WorldEntities");
+  TiXmlElement* element = root->FirstChildElement( "WorldEntities");
   
   if( element == NULL)
@@ -207 +206 @@
         element = element->FirstChildElement();
           // load Players/Objects/Whatever
+                PRINTF0("Loading WorldEntities\n");
                 while( element != NULL)
                 {
                         WorldEntity* created = (WorldEntity*) loader->fabricate( element);
-                        if( created != NULL) spawn( created);
-                        assert( element->Value() != NULL);
+                        if( created != NULL) this->spawn( created);
                                 // if we load a 'Player' we use it as localPlayer
-                        if( !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
+                        // if( element->Value() != NULL && !strcmp( element->Value(), "Player")) localPlayer = (Player*) created;
                         element = element->NextSiblingElement();
                 }
+                PRINTF0("Done loading WorldEntities\n");
         }
         
@@ -227 +227 @@
   {     
         //load track
-        trackManager = TrackManager::getInstance();
+                PRINTF0("Loading Track\n");
+                trackManager = TrackManager::getInstance();
         trackManager->loadTrack( element);
         trackManager->finalize();
+                PRINTF0("Done loading Track\n");
         }
 
@@ -495 +497 @@
   //gluNurbsProperty (theNurb, GLU_NURBS_MODE, GLU_NURBS_TESSELLATOR);
   //gluNurbsProperty (theNurb, GLU_NURBS_VERTEX, vertexCallback );
-
+        
+        PRINTF0("> Done Loading world: '%s'\n", getPath());
 }