Changeset 3542 in orxonox.OLD for orxonox/branches/levelloader/src/game_loader.cc

Timestamp:

Mar 14, 2005, 9:58:58 AM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: First incarnation of a debugworld loaded from a XML-File in place, compilability in place, all necessary basic loading constuctors in place. Unfortunately the code still generates interferences with the old hardcoded debugworld resulting in SegFault crash.

File:

• orxonox/branches/levelloader/src/game_loader.cc (modified) (6 diffs)

orxonox/branches/levelloader/src/game_loader.cc

@@ -161 +161 @@
   if( name == NULL)
   {
-                PRINTF(1)("No filename specified for loading");
+                PRINTF0("No filename specified for loading");
                 return NULL;
   }
@@ -170 +170 @@
         {
                 // report an error
-                PRINTF(1)("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+                PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
                 delete XMLDoc;
                 return NULL;
@@ -176 +176 @@
         
         // check basic validity
-        TiXmlElement* element = XMLDoc->RootElement();
-        assert( element != NULL);
-        
-        element = element->FirstChildElement( "Campaign");
-        
-        if( element == NULL )
+        TiXmlElement* root = XMLDoc->RootElement();
+        assert( root != NULL);
+        
+        if( strcmp( root->Value(), "Campaign"))
         {
                 // report an error
-                PRINTF(1)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+                PRINTF0("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
                 delete XMLDoc;
                 return NULL;
@@ -190 +188 @@
         
         // construct campaign
-        Campaign* c = new Campaign( element);
+        Campaign* c = new Campaign( root);
         
         // free the XML data
@@ -272 +270 @@
         assert( factory != NULL);
         
-        printf("Registered factory for '%s'\n", factory->getClassname());
+        PRINTF0("Registered factory for '%s'\n", factory->getClassname());
         
         if( first == NULL) first = factory;
@@ -286 +284 @@
         if( first == NULL)
         {
-                PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
+                PRINTF0("GameLoader does not know any factories, fabricate() failed\n");
                 return NULL;
         }