1 files changed, 51 insertions, 13 deletions

diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index b6d2e2f4..7f7150ff 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -1,35 +1,37 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_EQUIPMENT_H
-#define _TMW_EQUIPMENT_H
-
-#include "window.h"
+#ifndef EQUIPMENTWINDOW_H
+#define EQUIPMENTWINDOW_H
 
 #include <guichan/actionlistener.hpp>
 
-#include "../equipment.h"
+#include "window.h"
 
 class Equipment;
 class Image;
+class Inventory;
+class Item;
+class ItemPopup;
+class PlayerBox;
 
 /**
  * Equipment box.
@@ -51,7 +53,11 @@ class EquipmentWindow : public Window, public gcn::ActionListener
         /**
          * Constructor.
          */
+#ifdef TMWSERV_SUPPORT
         EquipmentWindow(Equipment *equipment);
+#else
+        EquipmentWindow();
+#endif
 
         /**
          * Destructor.
@@ -67,6 +73,7 @@ class EquipmentWindow : public Window, public gcn::ActionListener
 
         void mousePressed(gcn::MouseEvent& mouseEvent);
 
+#ifdef TMWSERV_SUPPORT
         enum{
             // Equipment rules:
             EQUIP_TORSO_SLOT = 0,
@@ -79,15 +86,46 @@ class EquipmentWindow : public Window, public gcn::ActionListener
             EQUIP_NECKLACE_SLOT = 7,
             EQUIP_FIGHT1_SLOT = 8,
             EQUIP_FIGHT2_SLOT = 9,
-            EQUIP_PROJECTILE_SLOT = 10
+            EQUIP_PROJECTILE_SLOT = 10,
+            EQUIP_VECTOREND
         };
+#else
+        enum {
+            // Equipment rules:
+            EQUIP_LEGS_SLOT = 0,
+            EQUIP_FIGHT1_SLOT,
+            EQUIP_GLOVES_SLOT,
+            EQUIP_RING2_SLOT,
+            EQUIP_RING1_SLOT,
+            EQUIP_FIGHT2_SLOT,
+            EQUIP_FEET_SLOT,
+            EQUIP_CAPE_SLOT,
+            EQUIP_HEAD_SLOT,
+            EQUIP_TORSO_SLOT,
+            EQUIP_AMMO_SLOT,
+            EQUIP_VECTOREND
+        };
+#endif
+
     private:
+        void mouseExited(gcn::MouseEvent &event);
+        void mouseMoved(gcn::MouseEvent &event);
+
+        Item* getItem(int x, int y) const;
+
         Equipment *mEquipment;
-        gcn::Button *mUnequip;              /**< Button for unequipping. */
+#ifdef EATHENA_SUPPORT
+        Inventory *mInventory;
+#endif
+        gcn::Button *mUnequip;                  /**< Button for unequipping. */
         Image *mBackground;                 /**< Background Image. */
-        EquipBox mEquipBox[EQUIPMENT_SIZE]; /**< Equipment Boxes. */
+        EquipBox mEquipBox[EQUIP_VECTOREND];    /**< Equipment Boxes. */
+
+        ItemPopup *mItemPopup;
+
+        PlayerBox *mPlayerBox;
 
-        int mSelected;                      /**< Index of selected item. */
+        int mSelected;                          /**< Index of selected item. */
 };
 
 extern EquipmentWindow *equipmentWindow;