Changeset 3249

Timestamp:

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

Author:

rgrieder

Message:

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

Location:

code/branches/core4/src/orxonox

Files:

• LevelManager.cc (modified) (4 diffs)
• LevelManager.h (modified) (2 diffs)
• gamestates/GSLevel.cc (modified) (3 diffs)

code/branches/core4/src/orxonox/LevelManager.cc

@@ -40 +40 @@
 namespace orxonox
 {
+    SetCommandLineArgument(level, "").shortcut("l");
+
     LevelManager* LevelManager::singletonRef_s = 0;
 
@@ -53 +55 @@
         if (!CommandLine::getArgument("level")->hasDefaultValue())
         {
-            ModifyConfigValue(startLevelName_, tset, CommandLine::getValue("mediaPath").getString());
+            ModifyConfigValue(defaultLevelName_, tset, CommandLine::getValue("mediaPath").getString());
         }
     }
@@ -65 +67 @@
     void LevelManager::setConfigValues()
     {
-        SetConfigValue(startLevelName_, "presentation_dm.oxw")
+        SetConfigValue(defaultLevelName_, "presentation_dm.oxw")
             .description("Sets the preselection of the level in the main menu.");
     }
@@ -113 +115 @@
     }
 
-    void LevelManager::setStartLevel(const std::string& levelName)
+    void LevelManager::setDefaultLevel(const std::string& levelName)
     {
-        ModifyConfigValue(startLevelName_, set, levelName);
+        ModifyConfigValue(defaultLevelName_, set, levelName);
     }
 
-    const std::string& LevelManager::getStartLevel()
+    const std::string& LevelManager::getDefaultLevel()
     {
-        return startLevelName_;
+        return defaultLevelName_;
     }
 }

code/branches/core4/src/orxonox/LevelManager.h

@@ -53 +53 @@
             Level* getActiveLevel();
 
-            void setStartLevel(const std::string& levelName); //tolua_export
-            const std::string& getStartLevel(); //tolua_export
+            void setDefaultLevel(const std::string& levelName); //tolua_export
+            const std::string& getDefaultLevel(); //tolua_export
 
             static LevelManager* getInstancePtr() { return singletonRef_s; }
@@ -67 +67 @@
 
             // config values
-            std::string startLevelName_;
+            std::string defaultLevelName_;
 
             static LevelManager* singletonRef_s;

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);
     }