Changeset 5695 for code/trunk/src/orxonox/gamestates/GSLevel.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/gamestates/GSLevel.cc
r5693 r5695 29 29 30 30 #include "GSLevel.h" 31 32 #include <OgreCompositorManager.h> 31 33 32 34 #include "core/input/InputManager.h" … … 166 168 */ 167 169 170 if (GameMode::showsGraphics()) 171 { 172 // unload all compositors (this is only necessary because we don't yet destroy all resources!) 173 Ogre::CompositorManager::getSingleton().removeAll(); 174 } 168 175 169 176 // this call will delete every BaseObject! … … 229 236 // call the loader 230 237 COUT(0) << "Loading level..." << std::endl; 231 startFile_s = new XMLFile( Core::getMediaPathString() + "levels" + '/' +LevelManager::getInstance().getDefaultLevel());238 startFile_s = new XMLFile(LevelManager::getInstance().getDefaultLevel()); 232 239 Loader::open(startFile_s); 233 240 }
Note: See TracChangeset
for help on using the changeset viewer.