summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-22 18:42:21 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-22 18:42:21 +0000
commit8c0964dbb59a10c47d2040686b03201ab5688092 (patch)
tree2d3028f7f82f5a331407357be2dcaff70e62d735 /src/game.cpp
parent72675288113644c0d12fccb85d9aa2f4c0b59965 (diff)
downloadmana-8c0964dbb59a10c47d2040686b03201ab5688092.tar.gz
mana-8c0964dbb59a10c47d2040686b03201ab5688092.tar.bz2
mana-8c0964dbb59a10c47d2040686b03201ab5688092.tar.xz
mana-8c0964dbb59a10c47d2040686b03201ab5688092.zip
Fixed a bug, thanks GCC 4.3!
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index e963b5d7..7834b42f 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -746,8 +746,8 @@ void Game::handleInput()
player_node->setWalkingDir(direction);
// Attacking monsters
- if ( keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
- joystick && joystick->buttonPressed(0))
+ if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
+ (joystick && joystick->buttonPressed(0)))
{
Being *target = NULL;
bool newTarget = keyboard.isKeyActive(keyboard.KEY_TARGET);