1 files changed, 57 insertions, 9 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 168ae22f..96500e88 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra derived from original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  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
@@ -38,6 +37,7 @@
 #include "../item.h"
 #include "../localplayer.h"
 
+#include "../resources/image.h"
 #include "../resources/iteminfo.h"
 #include "../resources/resourcemanager.h"
 
@@ -59,11 +59,19 @@ static const int boxPosition[][2] = {
     {129, 78}    // EQUIP_AMMO_SLOT
 };
 
+#ifdef TMWSERV_SUPPORT
+EquipmentWindow::EquipmentWindow(Equipment *equipment):
+#else
 EquipmentWindow::EquipmentWindow():
+#endif
     Window(_("Equipment")),
+#ifdef TMWSERV_SUPPORT
+    mEquipment(equipment),
+#endif
+    mBackground(NULL),
     mSelected(-1)
 {
-    mItemPopup = new ItemPopup();
+    mItemPopup = new ItemPopup;
     mItemPopup->setOpaque(false);
 
     // Control that shows the Player
@@ -84,19 +92,31 @@ EquipmentWindow::EquipmentWindow():
     add(mPlayerBox);
     add(mUnequip);
 
+#ifdef TMWSERV_SUPPORT
+    for (int i = 0; i < EQUIPMENT_SIZE; i++)
+#else
     for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
+#endif
     {
         mEquipBox[i].posX = boxPosition[i][0] + getPadding();
         mEquipBox[i].posY = boxPosition[i][1] + getTitleBarHeight();
     }
 
+    ResourceManager *resman = ResourceManager::getInstance();
+    mBackground = resman->getImage("graphics/gui/equip_bg.png");
+    mBackground->setAlpha(0.3);
+
+#ifdef EATHENA_SUPPORT
     mEquipment = player_node->mEquipment.get();
     mInventory = player_node->getInventory();
+#endif
 }
 
 EquipmentWindow::~EquipmentWindow()
 {
+    mBackground->decRef();
     delete mItemPopup;
+    delete mUnequip;
 }
 
 void EquipmentWindow::draw(gcn::Graphics *graphics)
@@ -107,13 +127,15 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
     // Draw window graphics
     Window::draw(graphics);
 
-    Item* item;
-
     Graphics *g = static_cast<Graphics*>(graphics);
 
     Window::drawChildren(graphics);
 
+#ifdef TMWSERV_SUPPORT
+    for (int i = 0; i < EQUIPMENT_SIZE; i++)
+#else
     for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
+#endif
     {
         if (i == mSelected)
         {
@@ -131,14 +153,19 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
         g->drawRectangle(gcn::Rectangle(mEquipBox[i].posX, mEquipBox[i].posY,
                                         BOX_WIDTH, BOX_HEIGHT));
 
-        item = (i != EQUIP_AMMO_SLOT) ?
+#ifdef TMWSERV_SUPPORT
+        Item *item = mEquipment->getEquipment(i);
+#else
+        Item *item = (i != EQUIP_AMMO_SLOT) ?
                mInventory->getItem(mEquipment->getEquipment(i)) :
                mInventory->getItem(mEquipment->getArrows());
+#endif
         if (item)
         {
             // Draw Item.
-            Image* image = item->getImage();
+            Image *image = item->getImage();
             g->drawImage(image, mEquipBox[i].posX, mEquipBox[i].posY);
+#ifdef EATHENA_SUPPORT
             if (i == EQUIP_AMMO_SLOT)
             {
                 g->setColor(guiPalette->getColor(Palette::TEXT));
@@ -147,6 +174,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
                                    mEquipBox[i].posY - getFont()->getHeight(),
                                    gcn::Graphics::CENTER);
             }
+#endif
         }
     }
 }
@@ -155,26 +183,38 @@ void EquipmentWindow::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "unequip" && mSelected > -1)
     {
+#ifdef TMWSERV_SUPPORT
+        player_node->unequipItem(mSelected);
+#else
         Item* item = (mSelected != EQUIP_AMMO_SLOT) ?
                      mInventory->getItem(mEquipment->getEquipment(mSelected)) :
                      mInventory->getItem(mEquipment->getArrows());
         player_node->unequipItem(item);
+#endif
         mSelected = -1;
     }
 }
 
-Item* EquipmentWindow::getItem(const int &x, const int &y)
+Item* EquipmentWindow::getItem(int x, int y) const
 {
+#ifdef TMWSERV_SUPPORT
+    for (int i = 0; i < EQUIPMENT_SIZE; i++)
+#else
     for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
+#endif
     {
         gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
                              BOX_WIDTH, BOX_HEIGHT);
 
         if (tRect.isPointInRect(x, y))
         {
+#ifdef TMWSERV_SUPPORT
+            return mEquipment->getEquipment(i);
+#else
             return (i != EQUIP_AMMO_SLOT) ?
                     mInventory->getItem(mEquipment->getEquipment(i)) :
                     mInventory->getItem(mEquipment->getArrows());
+#endif
         }
     }
     return NULL;
@@ -192,11 +232,19 @@ void EquipmentWindow::mousePressed(gcn::MouseEvent& mouseEvent)
     if (mouseEvent.getButton() == gcn::MouseEvent::LEFT)
     {
         // Checks if any of the presses were in the equip boxes.
+#ifdef TMWSERV_SUPPORT
+        for (int i = 0; i < EQUIPMENT_SIZE; i++)
+#else
         for (int i = EQUIP_LEGS_SLOT; i < EQUIP_VECTOREND; i++)
+#endif
         {
+#ifdef TMWSERV_SUPPORT
+            item = mEquipment->getEquipment(i);
+#else
             item = (i != EQUIP_AMMO_SLOT) ?
                     mInventory->getItem(mEquipment->getEquipment(i)) :
                     mInventory->getItem(mEquipment->getArrows());
+#endif
             gcn::Rectangle tRect(mEquipBox[i].posX, mEquipBox[i].posY,
                                  BOX_WIDTH, BOX_HEIGHT);