Changeset 4003 in orxonox.OLD for orxonox/branches/ll2trunktemp/src/game_loader.cc

Timestamp:

Apr 28, 2005, 2:25:08 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/ll2trunktemp: some small modifications, testing, why 2 instances of fabricate are deleted, and not just the first one

File:

• orxonox/branches/ll2trunktemp/src/game_loader.cc (modified) (1 diff)

orxonox/branches/ll2trunktemp/src/game_loader.cc

@@ -166 +166 @@
   
   if( name == NULL)
-  {
-                PRINTF0("No filename specified for loading");
-                return NULL;
-  }
+    {
+      PRINTF0("No filename specified for loading");
+      return NULL;
+    }
   
-        TiXmlDocument* XMLDoc = new TiXmlDocument( name);
-        // load the campaign document
-        if( !XMLDoc->LoadFile())
-        {
-                // report an error
-                PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
-                delete XMLDoc;
-                return NULL;
-        }
-        
-        // check basic validity
-        TiXmlElement* root = XMLDoc->RootElement();
-        assert( root != NULL);
-        
-        if( strcmp( root->Value(), "Campaign"))
-        {
-                // report an error
-                PRINTF0("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
-                delete XMLDoc;
-                return NULL;
-        }
-        
-        // construct campaign
-        Campaign* c = new Campaign( root);
-        
-        // free the XML data
-        delete XMLDoc;
-        
-        return c;
+  TiXmlDocument* XMLDoc = new TiXmlDocument( name);
+  // load the campaign document
+  if( !XMLDoc->LoadFile())
+    {
+      // report an error
+      PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+      delete XMLDoc;
+      return NULL;
+    }
+        
+  // check basic validity
+  TiXmlElement* root = XMLDoc->RootElement();
+  assert( root != NULL);
+        
+  if( strcmp( root->Value(), "Campaign"))
+    {
+      // report an error
+      PRINTF0("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+      delete XMLDoc;
+      return NULL;
+    }
+        
+  // construct campaign
+  Campaign* c = new Campaign( root);
+        
+  // free the XML data
+  delete XMLDoc;
+        
+  return c;
 }