Changeset 1934 for code/trunk

Timestamp:

Oct 15, 2008, 4:03:11 PM (16 years ago)

Author:

rgrieder

Message:

Re-reverted revisions 1931-1932

Location:

code/trunk/src

Files:

• core/input/InputManager.cc (modified) (3 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (3 diffs)

code/trunk/src/core/input/InputManager.cc

@@ -47 +47 @@
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
+#include "core/CommandLine.h"
 #include "util/Debug.h"
 
@@ -62 +63 @@
     SetConsoleCommand(InputManager, calibrate, true);
     SetConsoleCommand(InputManager, reload, false);
+    SetCommandLineSwitch(keyboard_no_grab);
 
     std::string InputManager::bindingCommmandString_s = "";
@@ -153 +155 @@
 #if defined OIS_LINUX_PLATFORM
             paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
+            paramList.insert(std::make_pair(std::string("x11_mouse_grab"), "true"));
+            paramList.insert(std::make_pair(std::string("x11_mouse_hide"), "true"));
+            bool kbNoGrab;
+            CommandLine::getValue("keyboard_no_grab", &kbNoGrab);
+            if (kbNoGrab)
+                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));
+            else
+                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("true")));
 #endif
 

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

@@ -38 +38 @@
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
+#include "core/CommandLine.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"
@@ -49 +50 @@
 namespace orxonox
 {
+    SetCommandLineArgument(level, "sample.oxw").setShortcut("l");
+
     GSLevel::GSLevel(const std::string& name)
         : GameState<GSGraphics>(name)
@@ -157 +160 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
+        std::string levelName;
+        CommandLine::getValue("level", &levelName);
+        startLevel_ = new Level(Settings::getDataPath() + std::string("levels/") + levelName);
         Loader::open(startLevel_);
     }