Changeset 4223 in orxonox.OLD for orxonox/branches/physics/src/game_loader.cc

Timestamp:

May 19, 2005, 7:45:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

File:

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

orxonox/branches/physics/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;