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

Timestamp:

Mar 13, 2005, 10:40:25 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Got the system to compile, the basic backbone now runs. What remains to be done is implementing all necessary functions to load all vital classes into a world

File:

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

orxonox/branches/levelloader/src/game_loader.cc

@@ -15 +15 @@
    co-programmer: ...
 */
-
 
 #include "game_loader.h"
@@ -162 +161 @@
   if( name == NULL)
   {
-                PRINTF(ERR)("No filename specified for loading");
+                PRINTF(1)("No filename specified for loading");
                 return NULL;
   }
@@ -168 +167 @@
         TiXmlDocument* XMLDoc = new TiXmlDocument( name);
         // load the campaign document
-        if( !XMLDoc.LoadFile())
+        if( !XMLDoc->LoadFile())
         {
                 // report an error
-                PRINTF(ERR)("Error loading XML File: %s @ %d:%d\n", XMLDoc.ErrorDesc(), XMLDoc.ErrorRow(), XMLDoc.ErrorCol());
+                PRINTF(1)("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
                 delete XMLDoc;
                 return NULL;
@@ -177 +176 @@
         
         // check basic validity
-        TiXmlElement* element = XMLDoc.RootElement();
+        TiXmlElement* element = XMLDoc->RootElement();
         assert( element != NULL);
         
@@ -185 +184 @@
         {
                 // report an error
-                PRINTF(ERR)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+                PRINTF(1)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
                 delete XMLDoc;
                 return NULL;
@@ -191 +190 @@
         
         // construct campaign
-        Campaign c = new Campaign( element);
+        Campaign* c = new Campaign( element);
         
         // free the XML data
         delete XMLDoc;
+        
+        return c;
 }
 
@@ -269 +270 @@
 void GameLoader::registerFactory( Factory* factory)
 {
-        if( next == NULL) next = factory;
-        else next->registerFactory( factory);
+        assert( factory != NULL);
+        
+        printf("Registered factory for '%s'\n", factory->getClassname());
+        
+        if( first == NULL) first = factory;
+        else first->registerFactory( factory);
 }
 
@@ -277 +282 @@
    \param element a XMLElement containing all the needed info
 */
-StoryEntity* GameLoader::fabricate( TiXmlElement* element)
+BaseObject* GameLoader::fabricate( TiXmlElement* element)
 {
         if( first == NULL)
         {
-                PRINTF(ERR)("GameLoader does not know any factories, fabricate() failed\n");
+                PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
                 return NULL;
         }