Changeset 4217 in orxonox.OLD for orxonox/branches/movie_player/src/game_loader.cc

Timestamp:

May 18, 2005, 11:27:40 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/movie_player: merged the trunk back into the movie_player
merged with command:
svn merge -r 4014:HEAD ../trunk/ movie_player/
no conflicts

File:

• orxonox/branches/movie_player/src/game_loader.cc (modified) (13 diffs)

orxonox/branches/movie_player/src/game_loader.cc

@@ -25 +25 @@
 #include "command_node.h"
 #include "vector.h"
+#include "resource_manager.h"
 #include "factory.h"
 
@@ -36 +37 @@
 
 
-GameLoader::GameLoader () {}
+GameLoader::GameLoader () 
+{
+  first = NULL;
+}
 
 
@@ -70 +74 @@
    this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
 */
-ErrorMessage GameLoader::loadCampaign(char* name)
+ErrorMessage GameLoader::loadCampaign(const char* name)
 {
   ErrorMessage errorCode;
-  
-  this->currentCampaign = this->fileToCampaign(name);
+  char* campaignName = ResourceManager::getFullName(name);
+  if (campaignName)
+    {
+      this->currentCampaign = this->fileToCampaign(campaignName);
+      delete campaignName;
+    }
 }
 
@@ -159 +167 @@
    this will interprete the map/campaign files and recursivly load a tree of worlds/campaigns
 */
-Campaign* GameLoader::fileToCampaign(char *name)
+Campaign* GameLoader::fileToCampaign(const char *name)
 {
   /* do not entirely load the campaign. just the current world
@@ -168 +176 @@
   if( name == NULL)
     {
-      PRINTF0("No filename specified for loading");
+      PRINTF(2)("No filename specified for loading");
       return NULL;
     }
@@ -177 +185 @@
     {
       // report an error
-      PRINTF0("Error loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+      PRINTF(1)("Could not load XML File %s: %s @ %d:%d\n", name, XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
       delete XMLDoc;
       return NULL;
@@ -189 +197 @@
     {
       // report an error
-      PRINTF(0)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
+      PRINTF(2)("Specified XML File is not an orxonox campaign file (Campaign element missing)\n");
       delete XMLDoc;
       return NULL;
@@ -211 +219 @@
 bool GameLoader::worldCommand (Command* cmd)
 {
-  if( !strcmp( cmd->cmd, "up_world"))
+  if( !strcmp( cmd->cmd, CONFIG_NAME_NEXT_WORLD))
     {
       if( !cmd->bUp) 
@@ -219 +227 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "down_world"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_PREV_WORLD))
     {
       if( !cmd->bUp)
@@ -227 +235 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "pause"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_PAUSE))
     {
       if( !cmd->bUp)
@@ -238 +246 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "quit"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_QUIT))
     {
       if( !cmd->bUp) this->stop();
@@ -276 +284 @@
         assert( factory != NULL);
         
-        PRINTF0("Registered factory for '%s'\n", factory->getClassname());
+        PRINTF(4)("Registered factory for '%s'\n", factory->getFactoryName());
         
         if( first == NULL) first = factory;
@@ -288 +296 @@
 BaseObject* GameLoader::fabricate( TiXmlElement* element)
 {
-        assert( element != NULL);
-        
-        if( first == NULL)
-        {
-                PRINTF0("GameLoader does not know any factories, fabricate() failed\n");
-                return NULL;
-        }
-        
-        if( element->Value() != NULL)
-        {
-                PRINTF0("Attempting fabrication of a '%s'\n", element->Value());
-                BaseObject* b = first->fabricate( element);
-                if( b == NULL) PRINTF0("Failed to fabricate a '%s'\n", element->Value());
-                else PRINTF0("Successfully fabricated a '%s'\n", element->Value());
-                return b;
-        }
-        
-        PRINTF0("Fabricate failed, TiXmlElement did not contain a value\n");
-        
-        return NULL;
-}
+  assert( element != NULL);
+        
+  if( first == NULL)
+    {
+      PRINTF(1)("GameLoader does not know any factories, fabricate() failed\n");
+      return NULL;
+    }
+        
+  if( element->Value() != NULL)
+    {
+      PRINTF(4)("Attempting fabrication of a '%s'\n", element->Value());
+      BaseObject* b = first->fabricate( element);
+      if( b == NULL) 
+        PRINTF(2)("Failed to fabricate a '%s'\n", element->Value());
+      else 
+        PRINTF(4)("Successfully fabricated a '%s'\n", element->Value());
+      return b;
+    }
+        
+  PRINTF(2)("Fabricate failed, TiXmlElement did not contain a value\n");
+        
+  return NULL;
+}