Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1934


Ignore:
Timestamp:
Oct 15, 2008, 4:03:11 PM (11 years ago)
Author:
rgrieder
Message:

Re-reverted revisions 1931-1932

Location:
code/trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/core/input/InputManager.cc

    r1932 r1934  
    4747#include "core/CommandExecutor.h"
    4848#include "core/ConsoleCommand.h"
     49#include "core/CommandLine.h"
    4950#include "util/Debug.h"
    5051
     
    6263    SetConsoleCommand(InputManager, calibrate, true);
    6364    SetConsoleCommand(InputManager, reload, false);
     65    SetCommandLineSwitch(keyboard_no_grab);
    6466
    6567    std::string InputManager::bindingCommmandString_s = "";
     
    153155#if defined OIS_LINUX_PLATFORM
    154156            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            else
     164                paramList.insert(std::make_pair(std::string("x11_keyboard_grab"), std::string("true")));
    155165#endif
    156166
  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r1932 r1934  
    3838#include "core/CommandExecutor.h"
    3939#include "core/ConsoleCommand.h"
     40#include "core/CommandLine.h"
    4041#include "core/ConfigValueIncludes.h"
    4142#include "core/CoreIncludes.h"
     
    4950namespace orxonox
    5051{
     52    SetCommandLineArgument(level, "sample.oxw").setShortcut("l");
     53
    5154    GSLevel::GSLevel(const std::string& name)
    5255        : GameState<GSGraphics>(name)
     
    157160        // call the loader
    158161        COUT(0) << "Loading level..." << std::endl;
    159         startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
     162        std::string levelName;
     163        CommandLine::getValue("level", &levelName);
     164        startLevel_ = new Level(Settings::getDataPath() + std::string("levels/") + levelName);
    160165        Loader::open(startLevel_);
    161166    }
Note: See TracChangeset for help on using the changeset viewer.