1 files changed, 29 insertions, 20 deletions
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 5688bf30..5ba15ae3 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -23,7 +23,6 @@
 #define EQUIPMENTWINDOW_H
 
 #include "equipment.h"
-#include "guichanfwd.h"
 
 #include "gui/widgets/window.h"
 
@@ -41,14 +40,8 @@ class ItemPopup;
 class EquipmentWindow : public Window, public gcn::ActionListener
 {
     public:
-        /**
-         * Constructor.
-         */
         EquipmentWindow(Equipment *equipment);
 
-        /**
-         * Destructor.
-         */
         ~EquipmentWindow();
 
         /**
@@ -60,16 +53,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         void mousePressed(gcn::MouseEvent& mouseEvent);
 
-    private:
-        void mouseExited(gcn::MouseEvent &event);
-        void mouseMoved(gcn::MouseEvent &event);
-
-        Item *getItem(int x, int y) const;
-
-        void setSelected(int index);
-
-        Equipment *mEquipment;
-
+  protected:
         /**
          * Equipment box.
          */
@@ -79,14 +63,39 @@ class EquipmentWindow : public Window, public gcn::ActionListener
             int posY;
         };
 
-        EquipBox mEquipBox[Equipment::EQUIP_VECTOREND]; /**< Equipment Boxes. */
+        EquipBox *mEquipBox; /**< Equipment Boxes. */
+
+        int mSelected; /**< Index of selected item. */
+        Equipment *mEquipment;
+
+    private:
+        void mouseExited(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
+
+        Item *getItem(int x, int y) const;
+
+        void setSelected(int index);
 
         ItemPopup *mItemPopup;
         gcn::Button *mUnequip;
+};
 
-        int mSelected; /**< Index of selected item. */
+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
+#endif // EQUIPMENTWINDOW_H