diff options
| author | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
|---|---|---|
| committer | Bertram <bertram@cegetel.net> | 2010-03-03 23:36:37 +0100 |
| commit | 8cc31b582f372238ce6bd2c86888d312cf1fe5b2 (patch) | |
| tree | 8db5f864348d08a05b8533c7ede58e76741a98f8 /src/gui/viewport.h | |
| parent | b1845e9e081df1fc77d9bcbed3ab95792d6ba682 (diff) | |
| parent | d564943867452ad76e6d313a28870e640715dded (diff) | |
| download | mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.gz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.bz2 mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.tar.xz mana-client-8cc31b582f372238ce6bd2c86888d312cf1fe5b2.zip | |
Merge branch 'master' of gitorious.org:mana/mana
Conflicts:
src/being.cpp
Diffstat (limited to 'src/gui/viewport.h')
| -rw-r--r-- | src/gui/viewport.h | 6 |
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 |