Changeset 3358 for code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

Timestamp:

Jul 27, 2009, 2:42:37 PM (16 years ago)

Author:

rgrieder

Message:

Moved startup argument parsing (console, dedicated, server, client and standalone) from GSRoot.cc to Main.cc.
This allows to finally prevent GameState request while loading/unloading them (changed the code in Game.cc to enforce this).

File:

• code/branches/resource/src/orxonox/gamestates/GSGraphics.cc (modified) (2 diffs)

code/branches/resource/src/orxonox/gamestates/GSGraphics.cc

@@ -68 +68 @@
         masterInputState_ = InputManager::getInstance().createInputState("master", true);
         masterKeyBinder_ = new KeyBinder();
+        masterInputState_->setKeyHandler(masterKeyBinder_);
     }
 
@@ -99 +100 @@
 
         masterKeyBinder_->loadBindings("masterKeybindings.ini");
-        masterInputState_->setKeyHandler(masterKeyBinder_);
 
         // Load the SoundManager