Changeset 3245 for code/branches/core4/src/orxonox/gamestates/GSLevel.cc
- Timestamp:
- Jun 29, 2009, 1:32:40 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/core4/src/orxonox/gamestates/GSLevel.cc
r3243 r3245 71 71 , radar_(0) 72 72 , cameraManager_(0) 73 , levelManager_(0)74 73 { 75 74 RegisterObject(GSLevel); … … 120 119 if (GameMode::isMaster()) 121 120 { 122 // create the global LevelManager123 this->levelManager_ = new LevelManager();124 125 121 this->loadLevel(); 126 122 } … … 202 198 } 203 199 204 if (this->levelManager_)205 {206 delete this->levelManager_;207 this->levelManager_ = 0;208 }209 210 200 if (this->playerManager_) 211 201 { … … 255 245 CommandLine::getValue("level", &levelName); 256 246 if (levelName == "") 257 startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + Game::getInstance().getLevel());247 startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getStartLevel()); 258 248 else 259 249 startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
Note: See TracChangeset
for help on using the changeset viewer.