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

Timestamp:

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

Author:

rgrieder

Message:

Merged revision 5641 to resource3:

• Prepared build system for an external media directory.

File:

• code/branches/resource3/src/orxonox/objects/Level.cc (modified) (2 diffs)

code/branches/resource3/src/orxonox/objects/Level.cc

@@ -54 +54 @@
         this->xmlfilename_ = this->getFilename();
 
-        if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
-            this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
+        if (this->xmlfilename_.length() >= Core::getExternalMediaPathString().length())
+            this->xmlfilename_ = this->xmlfilename_.substr(Core::getExternalMediaPathString().length());
     }
 
@@ -101 +101 @@
         mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay
 
-        this->xmlfile_ = new XMLFile(Core::getMediaPathString() + this->xmlfilename_, mask);
+        this->xmlfile_ = new XMLFile(Core::getExternalMediaPathString() + this->xmlfilename_, mask);
 
         Loader::open(this->xmlfile_);