Added a way to specify where the equipment boxes will display.

A <box> sub tag was added to the <slot> tag with a x and y
parameter to do so.

1 files changed, 4 insertions, 18 deletions

diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 4b269325..209ecdb0 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -50,21 +50,6 @@
 static const int BOX_WIDTH = 36;
 static const int BOX_HEIGHT = 36;
 
-// Positions of the boxes, 2nd dimension is X and Y respectively.
-const int boxPosition[][2] = {
-    { 90,  40 },    // EQUIP_TORSO_SLOT
-    { 8,   78 },    // EQUIP_GLOVES_SLOT
-    { 70,  0 },     // EQUIP_HEAD_SLOT
-    { 50,  208 },   // EQUIP_LEGS_SLOT
-    { 90,  208 },   // EQUIP_FEET_SLOT
-    { 8,   168 },   // EQUIP_RING1_SLOT
-    { 129, 168 },   // EQUIP_RING2_SLOT
-    { 50,  40 },    // EQUIP_NECK_SLOT
-    { 8,   123 },   // EQUIP_FIGHT1_SLOT
-    { 129, 123 },   // EQUIP_FIGHT2_SLOT
-    { 129, 78 }     // EQUIP_PROJECTILE_SLOT
-};
-
 EquipmentWindow::EquipmentWindow(Equipment *equipment):
     Window(_("Equipment")),
     mEquipBox(0),
@@ -105,10 +90,11 @@ void EquipmentWindow::loadEquipBoxes()
     mBoxesNumber = mEquipment->getSlotNumber();
     mEquipBox = new EquipBox[mBoxesNumber];
 
-    for (int i = 0; i < mBoxesNumber; i++)
+    for (int i = 0; i < mBoxesNumber; ++i)
     {
-        mEquipBox[i].posX = boxPosition[i][0] + getPadding();
-        mEquipBox[i].posY = boxPosition[i][1] + getTitleBarHeight();
+        Position boxPosition = Net::getInventoryHandler()->getBoxPosition(i);
+        mEquipBox[i].posX = boxPosition.x + getPadding();
+        mEquipBox[i].posY = boxPosition.y + getTitleBarHeight();
     }
 }