Move StorageWindow to instancing intead of global

Also make storage under eAthena more flexible.

Reviewed-by: Dennis Friis

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 9a64ff78..5b92d950 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -30,13 +30,14 @@
 #include <guichan/mouselistener.hpp>
 
 class Being;
+class BeingPopup;
 class FloorItem;
 class Graphics;
 class ImageSet;
 class Item;
 class Map;
 class PopupMenu;
-class BeingPopup;
+class Window;
 
 /** Delay between two mouse calls when dragging mouse and move the player */
 const int walkingMouseDelay = 500;
@@ -107,7 +108,8 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
          * Shows a popup for an item.
          * TODO Find some way to get rid of Item here
          */
-        void showPopup(int x, int y, Item *item, bool isInventory = true);
+        void showPopup(Window *parent, int x, int y, Item *item,
+                       bool isInventory = true);
 
         /**
          * Closes the popup menu. Needed for when the player dies or switching