diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:41:30 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-08-19 02:41:30 +0200 |
commit | 011135415f7f9c5cfeb220540621dfd1c46e6db9 (patch) | |
tree | 55dd2943dca362045e7ed96ef72924728343351e /src/gui/equipmentwindow.h | |
parent | c392eab58774154177a0e790a414c2c52c8ce83b (diff) | |
parent | 27114fa2694318f2a1c56cb828a3b79731efcb74 (diff) | |
download | Mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.tar.gz Mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.tar.bz2 Mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.tar.xz Mana-011135415f7f9c5cfeb220540621dfd1c46e6db9.zip |
Merge git://gitorious.org/~bertram/mana/mana-equipment-fix into equipment-fix
Diffstat (limited to 'src/gui/equipmentwindow.h')
-rw-r--r-- | src/gui/equipmentwindow.h | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h index 5ba15ae3..b8e63efc 100644 --- a/src/gui/equipmentwindow.h +++ b/src/gui/equipmentwindow.h @@ -53,6 +53,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener void mousePressed(gcn::MouseEvent& mouseEvent); + /** + * Loads the correct amount of displayed equip boxes. + */ + void loadEquipBoxes(); + protected: /** * Equipment box. @@ -67,12 +72,14 @@ class EquipmentWindow : public Window, public gcn::ActionListener int mSelected; /**< Index of selected item. */ Equipment *mEquipment; + int mBoxesNumber; /**< Number of equipment boxes to display */ private: void mouseExited(gcn::MouseEvent &event); void mouseMoved(gcn::MouseEvent &event); Item *getItem(int x, int y) const; + const std::string getSlotName(int x, int y) const; void setSelected(int index); @@ -80,22 +87,6 @@ class EquipmentWindow : public Window, public gcn::ActionListener gcn::Button *mUnequip; }; -namespace TmwAthena { - -class TaEquipmentWindow : public EquipmentWindow -{ - public: - TaEquipmentWindow(Equipment *equipment); - ~TaEquipmentWindow(); - - /** - * Draws the equipment window using TmwAthena routine. - */ - void draw(gcn::Graphics *graphics); -}; - -} // namespace TmwAthena - extern EquipmentWindow *equipmentWindow; #endif // EQUIPMENTWINDOW_H |