Changeset 5679 for code/branches/resource3/src/orxonox/gamestates

Timestamp:

Aug 24, 2009, 8:17:56 PM (16 years ago)

Author:

rgrieder

Message:

Merged revision 5641 to resource3:

• Prepared build system for an external media directory.

Location:

code/branches/resource3/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (1 diff)
• GSLevel.cc (modified) (1 diff)

code/branches/resource3/src/orxonox/gamestates/GSGraphics.cc

@@ -96 +96 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile(Core::getMediaPathString() + "overlay/debug.oxo");
+        this->debugOverlay_ = new XMLFile(Core::getExternalMediaPathString() + "overlay/debug.oxo");
         Loader::open(debugOverlay_);
 

code/branches/resource3/src/orxonox/gamestates/GSLevel.cc

@@ -246 +246 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
+        startFile_s = new XMLFile(Core::getExternalMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
         Loader::open(startFile_s);
     }