Changeset 3036 for code/trunk/src/orxonox/gamestates

Timestamp:

May 24, 2009, 2:39:16 AM (16 years ago)

Author:

bknecht

Message:

we do now save what level you chose last time and will preselect it for you on restart . Of course you can still use —level or -l to choose your level in the old way.

File:

• code/trunk/src/orxonox/gamestates/GSLevel.cc (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -58 +58 @@
     AddGameState(GSLevel, "level");
 
-    SetCommandLineArgument(level, "presentation_dm.oxw").shortcut("l");
+    SetCommandLineArgument(level, "").shortcut("l");
     SetConsoleCommand(GSLevel, showIngameGUI, true);
-    SetConsoleCommand(GSLevel, setLevel, true);
 
     XMLFile* GSLevel::startFile_s = NULL;
@@ -254 +253 @@
         COUT(0) << "Loading level..." << std::endl;
         std::string levelName;
-        if (!startFile_s)
-        {
-            CommandLine::getValue("level", &levelName);
+        CommandLine::getValue("level", &levelName);
+        if (levelName == "")
+            startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + Game::getInstance().getLevel());
+        else
             startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
-        }
         Loader::open(startFile_s);
-    }
-
-    void GSLevel::setLevel(std::string levelName)
-    {
-        delete GSLevel::startFile_s;
-        GSLevel::startFile_s = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
     }