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

Timestamp:

May 21, 2009, 5:16:29 PM (16 years ago)

Author:

bknecht

Message:

You don't need no —level or -l anymore now. You may choose your favorite level from the main menu

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (4 diffs)
• GSLevel.h (modified) (2 diffs)

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

@@ -60 +60 @@
     SetCommandLineArgument(level, "presentation_dm.oxw").shortcut("l");
     SetConsoleCommand(GSLevel, showIngameGUI, true);
+    SetConsoleCommand(GSLevel, setLevel, true);
+
+    XMLFile* GSLevel::startFile_s = NULL;
 
     GSLevel::GSLevel(const std::string& name)
@@ -68 +71 @@
         , guiKeysOnlyInputState_(0)
         , radar_(0)
-        , startFile_(0)
         , cameraManager_(0)
         , levelManager_(0)
@@ -252 +254 @@
         COUT(0) << "Loading level..." << std::endl;
         std::string levelName;
-        CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
-        Loader::open(startFile_);
+        if (!startFile_s)
+        {
+            CommandLine::getValue("level", &levelName);
+            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);
     }
 
@@ -265 +276 @@
         //////////////////////////////////////////////////////////////////////////////////////////
 
-        delete this->startFile_;
+        delete startFile_s;
     }
 

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

@@ -48 +48 @@
 
         static void showIngameGUI(bool show);
+        static void setLevel(std::string levelName);
+
+        static XMLFile* startFile_s;
 
     protected:
@@ -63 +66 @@
         SimpleInputState*     guiKeysOnlyInputState_;   //!< input state if we only need the keys to use the GUI
         Radar*                radar_;                   //!< represents the Radar (not the HUD part)
-        XMLFile*              startFile_;               //!< current hard coded default level
         CameraManager*        cameraManager_;           //!< camera manager for this level
         LevelManager*         levelManager_;            //!< global level manager