diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-20 13:24:20 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-20 13:24:20 +0000 |
| commit | a84133850af6d348c0c4e252b26618148702153b (patch) | |
| tree | f4b8d7c9bbdeecd9c1976bdc3d3806909a25cd28 /src/game.cpp | |
| parent | 1afcf2608c0a466d2df21faea1530955cc8061fc (diff) | |
| download | mana-client-a84133850af6d348c0c4e252b26618148702153b.tar.gz mana-client-a84133850af6d348c0c4e252b26618148702153b.tar.bz2 mana-client-a84133850af6d348c0c4e252b26618148702153b.tar.xz mana-client-a84133850af6d348c0c4e252b26618148702153b.zip | |
Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style
to native for some files that were still missing this property. This is
a feeble attempt to reduce the amount of conflicts for future merges.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/game.cpp b/src/game.cpp index b53fbb8b..ca6f4993 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -677,8 +677,8 @@ void Game::handleInput() // Get the state of the keyboard keys keyboard.refreshActiveKeys(); - Uint16 x = player_node->mX; - Uint16 y = player_node->mY; + const Uint16 x = player_node->mX; + const Uint16 y = player_node->mY; unsigned char direction = 0; // Translate pressed keys to movement and direction @@ -754,8 +754,7 @@ void Game::handleInput() { if (joystick->buttonPressed(1)) { - FloorItem *item = floorItemManager->findByCoordinates( - player_node->mX, player_node->mY); + FloorItem *item = floorItemManager->findByCoordinates(x, y); if (item) player_node->pickUp(item); |