Fixed inventory window. Not resizable though.

Resizing of the inventory window may come back later. Also did some more
code cleanups, moving defines to enums, getting rid of eAthena-specific
offset handling (to be done in the network layer), etc.

Mantis-issue: 666

1 files changed, 12 insertions, 14 deletions

diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 0f6aa593..f539f8ab 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -36,8 +36,8 @@
 #include "../utils/gettext.h"
 #include "../utils/strprintf.h"
 
-ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item,
-    int maxRange):
+ItemAmountWindow::ItemAmountWindow(Usage usage, Window *parent, Item *item,
+                                   int maxRange):
     Window("", true, parent),
     mItem(item),
     mMax(maxRange),
@@ -87,23 +87,21 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item,
 
     switch (usage)
     {
-        case AMOUNT_TRADE_ADD:
+        case TradeAdd:
             setCaption(_("Select amount of items to trade."));
             break;
-        case AMOUNT_ITEM_DROP:
+        case ItemDrop:
             setCaption(_("Select amount of items to drop."));
             break;
-        case AMOUNT_STORE_ADD:
+        case StoreAdd:
             setCaption(_("Select amount of items to store."));
             break;
-        case AMOUNT_STORE_REMOVE:
+        case StoreRemove:
             setCaption(_("Select amount of items to retrieve."));
             break;
-        case AMOUNT_ITEM_SPLIT:
+        case ItemSplit:
             setCaption(_("Select amount of items to split."));
             break;
-        default:
-            break;
     }
 
     setLocationRelativeTo(getParentWindow());
@@ -142,21 +140,21 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
 
         switch (mUsage)
         {
-            case AMOUNT_TRADE_ADD:
+            case TradeAdd:
                 tradeWindow->tradeItem(mItem, amount);
                 break;
-            case AMOUNT_ITEM_DROP:
+            case ItemDrop:
                 player_node->dropItem(mItem, amount);
                 break;
 #ifdef TMWSERV_SUPPORT
-            case AMOUNT_ITEM_SPLIT:
+            case ItemSplit:
                 player_node->splitItem(mItem, amount);
                 break;
 #else
-            case AMOUNT_STORE_ADD:
+            case StoreAdd:
                 storageWindow->addStore(mItem, amount);
                 break;
-            case AMOUNT_STORE_REMOVE:
+            case StoreRemove:
                 storageWindow->removeStore(mItem, amount);
                 break;
 #endif