From dc5d9dee3f3f726d463f5f23f5902d1d0373df93 Mon Sep 17 00:00:00 2001 From: Joshua Langley Date: Tue, 24 Jul 2007 06:39:04 +0000 Subject: keyboard configuration - mainly documentation fixes. http://mantis.themanaworld.org/view.php?id=16 --- src/game.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index eb990e1b..a2ea9af6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -427,7 +427,7 @@ void Game::handleInput() { gcn::Window *requestedWindow = NULL; - if (//setupWindow->isVisible() && + if (setupWindow->isVisible() && keyboard.getNewKeyIndex() > keyboard.KEY_NO_VALUE) { keyboard.setNewKey((int) event.key.keysym.sym); @@ -569,7 +569,6 @@ void Game::handleInput() used = true; } - // Keys pressed together with Alt/Meta // Emotions and some internal gui windows if (event.key.keysym.mod & KMOD_ALT) @@ -668,7 +667,6 @@ void Game::handleInput() { direction |= Being::UP; } - else if ( keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) || joystick && joystick->isDown()) { -- cgit v1.2.3-60-g2f50