summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan-Fabian Humann <malastare@gmx.net>2005-12-29 14:46:58 +0000
committerJan-Fabian Humann <malastare@gmx.net>2005-12-29 14:46:58 +0000
commited258400f785bb1882ea7fe88bb3a12f8c19edd4 (patch)
treea9dcb07c969d4959a38a184b31b0d801fd5de382 /src
parent8528fc2521f9dbd8b86bf861f088fbc1affaef50 (diff)
downloadmana-ed258400f785bb1882ea7fe88bb3a12f8c19edd4.tar.gz
mana-ed258400f785bb1882ea7fe88bb3a12f8c19edd4.tar.bz2
mana-ed258400f785bb1882ea7fe88bb3a12f8c19edd4.tar.xz
mana-ed258400f785bb1882ea7fe88bb3a12f8c19edd4.zip
ixed two little bugs
Diffstat (limited to 'src')
-rw-r--r--src/gui/gui.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index fcb4b0d9..7149e5e8 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -267,8 +267,8 @@ Gui::mousePress(int mx, int my, int button)
showPopup(mx, my, being);
return;
}
- else if(floorItem = find_floor_item_by_id(
- find_floor_item_by_cor(mx, my)))
+ else if((floorItem = find_floor_item_by_id(
+ find_floor_item_by_cor(tilex, tiley))))
{
showPopup(mx, my, floorItem);
return;
@@ -290,7 +290,7 @@ Gui::mousePress(int mx, int my, int button)
Uint32 floorItemId;
// Interact with some being
- if (being = findNode(tilex, tiley))
+ if ((being = findNode(tilex, tiley)))
{
switch (being->getType())
{
@@ -315,7 +315,7 @@ Gui::mousePress(int mx, int my, int button)
}
}
// Pick up some item
- else if (floorItemId = find_floor_item_by_cor(tilex, tiley))
+ else if ((floorItemId = find_floor_item_by_cor(tilex, tiley)))
{
int dx = tilex - player_node->x;
int dy = tiley - player_node->y;