Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1932 for code/trunk


Ignore:
Timestamp:
Oct 15, 2008, 3:24:25 PM (16 years ago)
Author:
rgrieder
Message:

Reverted the two command line arguments

Location:
code/trunk/src
Files:
2 edited

Legend:

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

    r1931 r1932  
    4747#include "core/CommandExecutor.h"
    4848#include "core/ConsoleCommand.h"
    49 #include "core/CommandLine.h"
    5049#include "util/Debug.h"
    5150
     
    6362    SetConsoleCommand(InputManager, calibrate, true);
    6463    SetConsoleCommand(InputManager, reload, false);
    65     SetCommandLineSwitch(keyboard_no_grab);
    6664
    6765    std::string InputManager::bindingCommmandString_s = "";
     
    155153#if defined OIS_LINUX_PLATFORM
    156154            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")));
    165155#endif
    166156
  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r1930 r1932  
    3838#include "core/CommandExecutor.h"
    3939#include "core/ConsoleCommand.h"
    40 #include "core/CommandLine.h"
    4140#include "core/ConfigValueIncludes.h"
    4241#include "core/CoreIncludes.h"
     
    5049namespace orxonox
    5150{
    52     SetCommandLineArgument(level, "sample.oxw").setShortcut("l");
    53 
    5451    GSLevel::GSLevel(const std::string& name)
    5552        : GameState<GSGraphics>(name)
     
    160157        // call the loader
    161158        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");
    165160        Loader::open(startLevel_);
    166161    }
Note: See TracChangeset for help on using the changeset viewer.