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, 67 insertions, 150 deletions

diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp
index c5465835..5d93016f 100644
--- a/src/net/tradehandler.cpp
+++ b/src/net/tradehandler.cpp
@@ -1,40 +1,41 @@
 /*
  *  The Mana World
- *  Copyright (C) 2004  The Mana World Development Team
+ *  Copyright 2004 The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  The Mana World 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.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  The Mana World 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 this program; if not, write to the Free Software
+ *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "tradehandler.h"
+
 #include "messagein.h"
 #include "protocol.h"
-#include "tradehandler.h"
 
-#include "../inventory.h"
+#include "gameserver/player.h"
+
+#include "../beingmanager.h"
 #include "../item.h"
 #include "../localplayer.h"
-#include "../player_relations.h"
 
 #include "../gui/chat.h"
 #include "../gui/confirm_dialog.h"
 #include "../gui/trade.h"
 
-#include "../utils/gettext.h"
-
 std::string tradePartnerName;
+int tradePartnerID;
 
 /**
  * Listener for request trade dialogs
@@ -44,174 +45,90 @@ namespace {
     {
         void action(const gcn::ActionEvent &event)
         {
-            player_node->tradeReply(event.getId() == "yes");
-        };
+            if (event.getId() == "yes")
+                Net::GameServer::Player::requestTrade(tradePartnerID);
+            else
+                Net::GameServer::Player::acceptTrade(false);
+        }
     } listener;
 }
 
-TradeHandler::TradeHandler()
+TradeHandler::TradeHandler():
+    mAcceptTradeRequests(true)
 {
     static const Uint16 _messages[] = {
-        SMSG_TRADE_REQUEST,
-        SMSG_TRADE_RESPONSE,
-        SMSG_TRADE_ITEM_ADD,
-        SMSG_TRADE_ITEM_ADD_RESPONSE,
-        SMSG_TRADE_OK,
-        SMSG_TRADE_CANCEL,
-        SMSG_TRADE_COMPLETE,
+        GPMSG_TRADE_REQUEST,
+        GPMSG_TRADE_CANCEL,
+        GPMSG_TRADE_START,
+        GPMSG_TRADE_COMPLETE,
+        GPMSG_TRADE_ACCEPT,
+        GPMSG_TRADE_ADD_ITEM,
+        GPMSG_TRADE_SET_MONEY,
         0
     };
     handledMessages = _messages;
 }
 
+void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
+{
+    mAcceptTradeRequests = acceptTradeRequests;
+    if (mAcceptTradeRequests) {
+        chatWindow->chatLog("Accepting incoming trade requests", BY_SERVER);
+    } else {
+        chatWindow->chatLog("Ignoring incoming trade requests", BY_SERVER);
+    }
+}
 
-void TradeHandler::handleMessage(MessageIn *msg)
+void TradeHandler::handleMessage(MessageIn &msg)
 {
-    switch (msg->getId())
+    switch (msg.getId())
     {
-        case SMSG_TRADE_REQUEST:
-                // If a trade window or request window is already open, send a
-                // trade cancel to any other trade request.
-                //
-                // Note that it would be nice if the server would prevent this
-                // situation, and that the requesting player would get a
-                // special message about the player being occupied.
-                tradePartnerName = msg->readString(24);
-
-                if (player_relations.hasPermission(tradePartnerName, PlayerRelation::TRADE))
-                {
-                    if (!player_node->tradeRequestOk())
-                    {
-                        player_node->tradeReply(false);
-                        break;
-                    }
-
-                    player_node->setTrading(true);
-                    ConfirmDialog *dlg;
-                    dlg = new ConfirmDialog(_("Request for trade"),
-                            tradePartnerName +
-                            _(" wants to trade with you, do you accept?"));
-                    dlg->addActionListener(&listener);
-                }
-                else
-                {
-                    player_node->tradeReply(false);
-                    break;
-                }
-            break;
-
-        case SMSG_TRADE_RESPONSE:
-            switch (msg->readInt8())
+        case GPMSG_TRADE_REQUEST:
+        {
+            Being *being = beingManager->findBeing(msg.readInt16());
+            if (!being || !mAcceptTradeRequests)
             {
-                case 0: // Too far away
-                    chatWindow->chatLog(_("Trading isn't possible. Trade partner is too far away."),
-                            BY_SERVER);
-                    break;
-                case 1: // Character doesn't exist
-                    chatWindow->chatLog(_("Trading isn't possible. Character doesn't exist."),
-                            BY_SERVER);
-                    break;
-                case 2: // Invite request check failed...
-                    chatWindow->chatLog(_("Trade cancelled due to an unknown reason."),
-                                        BY_SERVER);
-                    break;
-                case 3: // Trade accepted
-                    tradeWindow->reset();
-                    tradeWindow->setCaption(
-                            _("Trade: You and ") + tradePartnerName);
-                    tradeWindow->setVisible(true);
-                    break;
-                case 4: // Trade cancelled
-                    if (player_relations.hasPermission(tradePartnerName,
-                                                       PlayerRelation::SPEECH_LOG))
-                        chatWindow->chatLog(_("Trade with ") + tradePartnerName +
-                                            _(" cancelled"), BY_SERVER);
-                    // otherwise ignore silently
-
-                    tradeWindow->setVisible(false);
-                    player_node->setTrading(false);
-                    break;
-                default: // Shouldn't happen as well, but to be sure
-                    chatWindow->chatLog(_("Unhandled trade cancel packet"),
-                            BY_SERVER);
-                    break;
+                Net::GameServer::Player::acceptTrade(false);
+                break;
             }
-            break;
+            player_node->setTrading(true);
+            tradePartnerName = being->getName();
+            tradePartnerID = being->getId();
+            ConfirmDialog *dlg = new ConfirmDialog("Request for trade",
+                tradePartnerName + " wants to trade with you, do you accept?");
+            dlg->addActionListener(&listener);
+        }   break;
+
+        case GPMSG_TRADE_ADD_ITEM:
+        {
+            int type = msg.readInt16();
+            int amount = msg.readInt8();
+            tradeWindow->addItem(type, false, amount);
+        }   break;
 
-        case SMSG_TRADE_ITEM_ADD:
-            {
-                Sint32 amount = msg->readInt32();
-                Sint16 type = msg->readInt16();
-                msg->readInt8();  // identified flag
-                msg->readInt8();  // attribute
-                msg->readInt8();  // refine
-                msg->skip(8);     // card (4 shorts)
-
-                // TODO: handle also identified, etc
-                if (type == 0) {
-                    tradeWindow->addMoney(amount);
-                } else {
-                    tradeWindow->addItem(type, false, amount, false);
-                }
-            }
+        case GPMSG_TRADE_SET_MONEY:
+            tradeWindow->setMoney(msg.readInt32());
             break;
 
-        case SMSG_TRADE_ITEM_ADD_RESPONSE:
-            // Trade: New Item add response (was 0x00ea, now 01b1)
-            {
-                const int index = msg->readInt16();
-                Item *item = player_node->getInventory()->getItem(index);
-                if (!item)
-                {
-                    tradeWindow->receivedOk(true);
-                    return;
-                }
-                Sint16 quantity = msg->readInt16();
-
-                switch (msg->readInt8())
-                {
-                    case 0:
-                        // Successfully added item
-                        if (item->isEquipment() && item->isEquipped())
-                        {
-                            player_node->unequipItem(item);
-                        }
-                        tradeWindow->addItem(item->getId(), true, quantity,
-                                item->isEquipment());
-                        item->increaseQuantity(-quantity);
-                        break;
-                    case 1:
-                        // Add item failed - player overweighted
-                        chatWindow->chatLog(_("Failed adding item. Trade partner is over weighted."),
-                                BY_SERVER);
-                        break;
-                    case 2:
-                         // Add item failed - player has no free slot
-                         chatWindow->chatLog(_("Failed adding item. Trade partner has no free slot."),
-                                             BY_SERVER);
-                         break;
-                    default:
-                        chatWindow->chatLog(_("Failed adding item for unknown reason."),
-                                             BY_SERVER);
-                        break;
-                }
-            }
+        case GPMSG_TRADE_START:
+            tradeWindow->reset();
+            tradeWindow->setCaption("Trading with " + tradePartnerName);
+            tradeWindow->setVisible(true);
             break;
 
-        case SMSG_TRADE_OK:
-            // 0 means ok from myself, 1 means ok from other;
-            tradeWindow->receivedOk(msg->readInt8() == 0);
+        case GPMSG_TRADE_ACCEPT:
+            tradeWindow->receivedOk();
             break;
 
-        case SMSG_TRADE_CANCEL:
-            chatWindow->chatLog(_("Trade canceled."), BY_SERVER);
+        case GPMSG_TRADE_CANCEL:
+            chatWindow->chatLog("Trade canceled.", BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             player_node->setTrading(false);
             break;
 
-        case SMSG_TRADE_COMPLETE:
-            chatWindow->chatLog(_("Trade completed."), BY_SERVER);
+        case GPMSG_TRADE_COMPLETE:
+            chatWindow->chatLog("Trade completed.", BY_SERVER);
             tradeWindow->setVisible(false);
             tradeWindow->reset();
             player_node->setTrading(false);