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

Timestamp:

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

Author:

chris

Message:

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

File:

• orxonox/branches/levelloader/src/story_entities/world.cc (modified) (7 diffs)

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());
 }