Changeset 5695 for code/trunk/src/orxonox/objects/Level.cc
- Timestamp:
- Aug 30, 2009, 2:22:00 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/resource2 (added) merged: 3373-3374,5594,5597,5610-5611,5614,5624,5641,5644-5646,5650-5664,5667-5672,5682-5684,5688-5691,5694
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/Level.cc
r3325 r5695 53 53 this->registerVariables(); 54 54 this->xmlfilename_ = this->getFilename(); 55 56 if (this->xmlfilename_.length() >= Core::getMediaPathString().length())57 this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());58 55 } 59 56 … … 101 98 mask.include(Class(OverlayGroup)); // HACK to include the ChatOverlay 102 99 103 this->xmlfile_ = new XMLFile( Core::getMediaPathString() + this->xmlfilename_, mask);100 this->xmlfile_ = new XMLFile(mask, this->xmlfilename_); 104 101 105 102 Loader::open(this->xmlfile_);
Note: See TracChangeset
for help on using the changeset viewer.