Changeset 3249 for code/branches/core4/src/orxonox/gamestates

Timestamp:

Jun 29, 2009, 4:01:35 PM (16 years ago)

Author:

rgrieder

Message:

StartLevel —> DefaultLevel and moved the CommandLine argument (—level) to the LevelManager.

File:

• code/branches/core4/src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

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

@@ -34 +34 @@
 #include "core/input/KeyBinder.h"
 #include "core/Clock.h"
-#include "core/CommandLine.h"
 #include "core/ConsoleCommand.h"
 #include "core/ConfigValueIncludes.h"
@@ -57 +56 @@
 {
     DeclareGameState(GSLevel, "level", false, true);
-
-    SetCommandLineArgument(level, "").shortcut("l");
     SetConsoleCommand(GSLevel, showIngameGUI, true);
 
@@ -242 +239 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        std::string levelName;
-        CommandLine::getValue("level", &levelName);
-        if (levelName == "")
-            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getStartLevel());
-        else
-            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
+        startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + LevelManager::getInstance().getDefaultLevel());
         Loader::open(startFile_s);
     }