Changeset 4139 in orxonox.OLD for orxonox/branches/md2_loader/src/game_loader.cc

Timestamp:

May 10, 2005, 10:39:01 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: merged trunk into branche using: svn merge ../trunk/ md2_loader -r 4063:HEAD

File:

• orxonox/branches/md2_loader/src/game_loader.cc (modified) (12 diffs)

orxonox/branches/md2_loader/src/game_loader.cc

@@ -25 +25 @@
 #include "command_node.h"
 #include "vector.h"
+#include "resource_manager.h"
 #include "factory.h"
 
@@ -76 +77 @@
 {
   ErrorMessage errorCode;
-  
-  this->currentCampaign = this->fileToCampaign(name);
+  char* campaignName;
+  if (ResourceManager::isFile(name))
+    {
+      this->currentCampaign = this->fileToCampaign(name);
+    }
+  else
+    {
+      campaignName = new char[strlen(ResourceManager::getInstance()->getDataDir())+strlen(name)];
+      sprintf(campaignName, "%s%s", ResourceManager::getInstance()->getDataDir(), name);
+      this->currentCampaign = this->fileToCampaign(campaignName);
+      delete campaignName;
+    }
 }
 
@@ -162 +173 @@
    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
@@ -171 +182 @@
   if( name == NULL)
     {
-      PRINTF0("No filename specified for loading");
+      PRINTF(2)("No filename specified for loading");
       return NULL;
     }
@@ -180 +191 @@
     {
       // 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;
@@ -192 +203 @@
     {
       // 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;
@@ -214 +225 @@
 bool GameLoader::worldCommand (Command* cmd)
 {
-  if( !strcmp( cmd->cmd, "up_world"))
+  if( !strcmp( cmd->cmd, CONFIG_NAME_NEXT_WORLD))
     {
       if( !cmd->bUp) 
@@ -222 +233 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "down_world"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_PREV_WORLD))
     {
       if( !cmd->bUp)
@@ -230 +241 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "pause"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_PAUSE))
     {
       if( !cmd->bUp)
@@ -241 +252 @@
       return true;
     }
-  else if( !strcmp( cmd->cmd, "quit"))
+  else if( !strcmp( cmd->cmd, CONFIG_NAME_QUIT))
     {
       if( !cmd->bUp) this->stop();
@@ -279 +290 @@
         assert( factory != NULL);
         
-        PRINTF0("Registered factory for '%s'\n", factory->getFactoryName());
+        PRINTF(4)("Registered factory for '%s'\n", factory->getFactoryName());
         
         if( first == NULL) first = factory;
@@ -291 +302 @@
 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;
+}