Cleaned up the showPopup() code, moved "map"-related code into game.cpp, made the popup show up at mouse coordinates instead of being aligned to tiles.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 377acc1f..28dbd35e 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -25,7 +25,6 @@
 #include "popupmenu.h"
 #include "../playerinfo.h"
 #include "../inventory.h"
-#include "../engine.h"
 #include "button.h"
 #include "scrollarea.h"
 #include "item_amount.h"
@@ -148,10 +147,10 @@ void InventoryWindow::mouseClick(int x, int y, int button, int count)
     {
         /*
          * convert relative to the window coordinates to
-         * absolute tile coordinates
+         * absolute screen coordinates
          */
-        int mx = (x + getX()) / 32 + camera_x;
-        int my = (y + getY()) / 32 + camera_y;
+        int mx = x + getX();
+        int my = y + getY();
         popupMenu->showPopup(mx, my, item);
     }
 }