diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 15:19:50 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-20 15:19:50 +0000 |
| commit | 35d2fefb789751b8730c6f0fae674e72673228d0 (patch) | |
| tree | 185c267faed52cd416cdefa16d1e160d2b0d3c02 /src/game.cpp | |
| parent | ca58ec1faedca0081ecd233f2cefa1ba783cebf4 (diff) | |
| download | Mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.gz Mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.bz2 Mana-35d2fefb789751b8730c6f0fae674e72673228d0.tar.xz Mana-35d2fefb789751b8730c6f0fae674e72673228d0.zip | |
Merged revisions 3692 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/trunk
........
r3692 | gmelquio | 2007-10-27 11:03:13 +0200 (Sat, 27 Oct 2007) | 1 line
Made it compile with GCC 4.3
........
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp index be1c62b6..2794b2e6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -693,24 +693,24 @@ void Game::handleInput() unsigned char direction = 0; // Translate pressed keys to movement and direction - if ( keyboard.isKeyActive(keyboard.KEY_MOVE_UP) || - joystick && joystick->isUp()) + if (keyboard.isKeyActive(keyboard.KEY_MOVE_UP) || + (joystick && joystick->isUp())) { direction |= Being::UP; } - else if ( keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) || - joystick && joystick->isDown()) + else if (keyboard.isKeyActive(keyboard.KEY_MOVE_DOWN) || + (joystick && joystick->isDown())) { direction |= Being::DOWN; } - if ( keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) || - joystick && joystick->isLeft()) + if (keyboard.isKeyActive(keyboard.KEY_MOVE_LEFT) || + (joystick && joystick->isLeft())) { direction |= Being::LEFT; } - else if ( keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) || - joystick && joystick->isRight()) + else if (keyboard.isKeyActive(keyboard.KEY_MOVE_RIGHT) || + (joystick && joystick->isRight())) { direction |= Being::RIGHT; } |