Changeset 1932 for code/trunk
- Timestamp:
- Oct 15, 2008, 3:24:25 PM (16 years ago)
- Location:
- code/trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/core/input/InputManager.cc
r1931 r1932 47 47 #include "core/CommandExecutor.h" 48 48 #include "core/ConsoleCommand.h" 49 #include "core/CommandLine.h"50 49 #include "util/Debug.h" 51 50 … … 63 62 SetConsoleCommand(InputManager, calibrate, true); 64 63 SetConsoleCommand(InputManager, reload, false); 65 SetCommandLineSwitch(keyboard_no_grab);66 64 67 65 std::string InputManager::bindingCommmandString_s = ""; … … 155 153 #if defined OIS_LINUX_PLATFORM 156 154 paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true"))); 157 paramList.insert(std::make_pair(std::string("x11_mouse_grab"), "true"));158 paramList.insert(std::make_pair(std::string("x11_mouse_hide"), "true"));159 bool kbNoGrab;160 CommandLine::getValue("keyboard_no_grab", &kbNoGrab);161 if (kbNoGrab)162 paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("false")));163 else164 paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("true")));165 155 #endif 166 156 -
code/trunk/src/orxonox/gamestates/GSLevel.cc
r1930 r1932 38 38 #include "core/CommandExecutor.h" 39 39 #include "core/ConsoleCommand.h" 40 #include "core/CommandLine.h"41 40 #include "core/ConfigValueIncludes.h" 42 41 #include "core/CoreIncludes.h" … … 50 49 namespace orxonox 51 50 { 52 SetCommandLineArgument(level, "sample.oxw").setShortcut("l");53 54 51 GSLevel::GSLevel(const std::string& name) 55 52 : GameState<GSGraphics>(name) … … 160 157 // call the loader 161 158 COUT(0) << "Loading level..." << std::endl; 162 std::string levelName; 163 CommandLine::getValue("level", &levelName); 164 startLevel_ = new Level(Settings::getDataPath() + std::string("levels/") + levelName); 159 startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw"); 165 160 Loader::open(startLevel_); 166 161 }
Note: See TracChangeset
for help on using the changeset viewer.