From ed258400f785bb1882ea7fe88bb3a12f8c19edd4 Mon Sep 17 00:00:00 2001 From: Jan-Fabian Humann Date: Thu, 29 Dec 2005 14:46:58 +0000 Subject: ixed two little bugs --- ChangeLog | 5 ++++- src/gui/gui.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 334679cc..7292f519 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,10 @@ * src/gui/gui.cpp: Added rather ugly workaround to prevent a on-start crash by Doener. - + * src/gui/gui.cpp: Fixed GCC 3.3.6 and 4.x paranthesis problem, patch by + r0nny. + Fixed popupMenu not showing on items. + 2005-12-29 Björn Steinbrink * src/game.cpp, src/gui/popupmenu.cpp, src/net/protocol.cpp: Remove 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; -- cgit v1.2.3-70-g09d2