Merged the tmwserv client with the eAthena client

This merge involved major changes on both sides, and as such took
several weeks. Lots of things are expected to be broken now, however, we
now have a single code base to improve and extend, which can be compiled
to support either eAthena or tmwserv.

In the coming months, the plan is to work towards a client that supports
both eAthena and tmwserv, without needing to be recompiled.

Conflicts:
	Everywhere!

1 files changed, 17 insertions, 2 deletions

diff --git a/src/gui/item_amount.cpp b/src/gui/item_amount.cpp
index 92be3d6e..3bd388f4 100644
--- a/src/gui/item_amount.cpp
+++ b/src/gui/item_amount.cpp
@@ -32,11 +32,15 @@
 
 #include "../utils/gettext.h"
 
-ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
+ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item,
+    int maxRange):
     Window("", true, parent),
     mItem(item)
 {
-    const int maxRange = mItem->getQuantity();
+    if (!maxRange)
+    {
+        maxRange = mItem->getQuantity();
+    }
 
     // Integer field
     mItemAmountTextField = new IntTextField(1);
@@ -80,6 +84,10 @@ ItemAmountWindow::ItemAmountWindow(int usage, Window *parent, Item *item):
             setCaption(_("Select amount of items to drop."));
             okButton->setActionEventId("Drop");
             break;
+        case AMOUNT_ITEM_SPLIT:
+            setCaption(_("Select amount of items to split."));
+            okButton->setActionEventId("Split");
+            break;
         default:
             break;
     }
@@ -123,6 +131,13 @@ void ItemAmountWindow::action(const gcn::ActionEvent &event)
         tradeWindow->tradeItem(mItem, mItemAmountTextField->getValue());
         scheduleDelete();
     }
+#ifdef TMWSERV_SUPPORT
+    else if (event.getId() == "Split")
+    {
+        player_node->splitItem(mItem, mItemAmountTextField->getValue());
+        scheduleDelete();
+    }
+#endif
     mItemAmountTextField->setValue(amount);
     mItemAmountSlide->setValue(amount);
 }