Changeset 4216 in orxonox.OLD for orxonox/trunk

Timestamp:

May 18, 2005, 11:17:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fix for levelloader, now uses resourceManager::getFullName

Location:

orxonox/trunk/src

Files:

• game_loader.cc (modified) (1 diff)
• game_loader.h (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)

orxonox/trunk/src/game_loader.cc

@@ -74 +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;
-  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);
+  char* campaignName = ResourceManager::getFullName(name);
+  if (campaignName)
+    {
       this->currentCampaign = this->fileToCampaign(campaignName);
       delete campaignName;

orxonox/trunk/src/game_loader.h

@@ -39 +39 @@
 
   ErrorMessage init();
-  ErrorMessage loadCampaign(char* name);
+  ErrorMessage loadCampaign(const char* name);
   ErrorMessage start();
   ErrorMessage stop();

orxonox/trunk/src/util/resource_manager.cc

@@ -648 +648 @@
 char* ResourceManager::getFullName(const char* fileName)
 {
-  char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(fileName)+1];
+  char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir())
+                           + strlen(fileName) + 1];
   sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
   if (ResourceManager::isFile(retName))