diff options
| author | Joshua Langley <joshlangley[at]optusnet.com.au> | 2007-07-24 06:39:04 +0000 |
|---|---|---|
| committer | Joshua Langley <joshlangley[at]optusnet.com.au> | 2007-07-24 06:39:04 +0000 |
| commit | dc5d9dee3f3f726d463f5f23f5902d1d0373df93 (patch) | |
| tree | 3e2a4f4e8f744c846a18fd17710f494dfd1f0711 /src/game.cpp | |
| parent | 71532a23200b246f63ed1e0dc3d563bd1184b593 (diff) | |
| download | mana-dc5d9dee3f3f726d463f5f23f5902d1d0373df93.tar.gz mana-dc5d9dee3f3f726d463f5f23f5902d1d0373df93.tar.bz2 mana-dc5d9dee3f3f726d463f5f23f5902d1d0373df93.tar.xz mana-dc5d9dee3f3f726d463f5f23f5902d1d0373df93.zip | |
keyboard configuration - mainly documentation fixes.
http://mantis.themanaworld.org/view.php?id=16
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
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()) { |