summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-30 19:17:09 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-30 19:17:09 +0300
commit11f548068b7ac05220437f595403ac41cc222a1e (patch)
tree92146ed4308b7eceacf0da327789831a2d3b48e2 /src/net/eathena
parent42a9e7b1eeced8503f909b0276ee251a2bfe75c6 (diff)
downloadmv-11f548068b7ac05220437f595403ac41cc222a1e.tar.gz
mv-11f548068b7ac05220437f595403ac41cc222a1e.tar.bz2
mv-11f548068b7ac05220437f595403ac41cc222a1e.tar.xz
mv-11f548068b7ac05220437f595403ac41cc222a1e.zip
Move receive code from tradehandler into separate file.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/tradehandler.cpp139
-rw-r--r--src/net/eathena/tradehandler.h14
-rw-r--r--src/net/eathena/traderecv.cpp162
-rw-r--r--src/net/eathena/traderecv.h45
4 files changed, 224 insertions, 136 deletions
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 537e205f9..082b3bf60 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -33,8 +33,11 @@
#include "gui/windows/tradewindow.h"
+#include "net/ea/traderecv.h"
+
#include "net/eathena/messageout.h"
#include "net/eathena/protocol.h"
+#include "net/eathena/traderecv.h"
#include "net/ea/eaprotocol.h"
@@ -44,9 +47,6 @@ extern Net::TradeHandler *tradeHandler;
namespace EAthena
{
-int TradeHandler::mQuantity = 0;
-int TradeHandler::mItemIndex = -1;
-
TradeHandler::TradeHandler() :
MessageHandler(),
Ea::TradeHandler()
@@ -65,8 +65,8 @@ TradeHandler::TradeHandler() :
};
handledMessages = _messages;
tradeHandler = this;
- mItemIndex = -1;
- mQuantity = 0;
+ TradeRecv::mItemIndex = -1;
+ TradeRecv::mQuantity = 0;
}
@@ -75,35 +75,35 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_TRADE_REQUEST:
- processTradeRequest(msg);
+ TradeRecv::processTradeRequest(msg);
break;
case SMSG_TRADE_RESPONSE:
- processTradeResponse(msg);
+ TradeRecv::processTradeResponse(msg);
break;
case SMSG_TRADE_ITEM_ADD:
- processTradeItemAdd(msg);
+ TradeRecv::processTradeItemAdd(msg);
break;
case SMSG_TRADE_ITEM_ADD_RESPONSE:
- processTradeItemAddResponse(msg);
+ TradeRecv::processTradeItemAddResponse(msg);
break;
case SMSG_TRADE_OK:
- processTradeOk(msg);
+ Ea::TradeRecv::processTradeOk(msg);
break;
case SMSG_TRADE_CANCEL:
- processTradeCancel(msg);
+ Ea::TradeRecv::processTradeCancel(msg);
break;
case SMSG_TRADE_COMPLETE:
- processTradeComplete(msg);
+ Ea::TradeRecv::processTradeComplete(msg);
break;
case SMSG_TRADE_UNDO:
- processTradeUndo(msg);
+ TradeRecv::processTradeUndo(msg);
break;
default:
@@ -134,10 +134,11 @@ void TradeHandler::addItem(const Item *const item, const int amount) const
if (!item)
return;
- mItemIndex = item->getInvIndex();
- mQuantity = amount;
+ TradeRecv::mItemIndex = item->getInvIndex();
+ TradeRecv::mQuantity = amount;
createOutPacket(CMSG_TRADE_ITEM_ADD_REQUEST);
- outMsg.writeInt16(static_cast<int16_t>(mItemIndex + INVENTORY_OFFSET),
+ outMsg.writeInt16(static_cast<int16_t>(
+ TradeRecv::mItemIndex + INVENTORY_OFFSET),
"index");
outMsg.writeInt32(amount, "amount");
}
@@ -164,110 +165,4 @@ void TradeHandler::cancel() const
createOutPacket(CMSG_TRADE_CANCEL_REQUEST);
}
-void TradeHandler::processTradeRequest(Net::MessageIn &msg)
-{
- const std::string &partner = msg.readString(24, "name");
- msg.readInt32("char id");
- msg.readInt16("base level");
- processTradeRequestContinue(partner);
-}
-
-void TradeHandler::processTradeResponse(Net::MessageIn &msg)
-{
- const uint8_t type = msg.readUInt8("type");
- msg.readInt32("char id");
- msg.readInt16("base level");
- processTradeResponseContinue(type);
-}
-
-void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
-{
- const int type = msg.readInt16("type");
- const int itemType = msg.readUInt8("item type");
- const int amount = msg.readInt32("amount");
- const uint8_t identify = msg.readUInt8("identify");
- const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
- const uint8_t refine = msg.readUInt8("refine");
- int cards[4];
- for (int f = 0; f < 4; f++)
- cards[f] = msg.readInt16("card");
-
- if (tradeWindow)
- {
- if (type == 0)
- {
- tradeWindow->setMoney(amount);
- }
- else
- {
- tradeWindow->addItem2(type,
- itemType,
- cards,
- 4,
- false,
- amount,
- refine,
- ItemColorManager::getColorFromCards(&cards[0]),
- fromBool(identify, Identified),
- damaged,
- Favorite_false,
- Equipm_false);
- }
- }
-}
-
-void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg)
-{
- msg.readInt16("index");
- const uint8_t res = msg.readUInt8("fail");
- switch (res)
- {
- case 0: // Successfully added item
- case 9: // silent added item
- {
- Item *const item = PlayerInfo::getInventory()->getItem(
- mItemIndex);
- if (!item)
- return;
- if (tradeWindow)
- {
- tradeWindow->addItem2(item->getId(),
- item->getType(),
- item->getCards(),
- 4,
- true,
- mQuantity,
- item->getRefine(),
- item->getColor(),
- item->getIdentified(),
- item->getDamaged(),
- item->getFavorite(),
- item->isEquipment());
- }
- item->increaseQuantity(-mQuantity);
- mItemIndex = -1;
- mQuantity = 0;
- break;
- }
- case 1:
- // Add item failed - player overweighted
- NotifyManager::notify(NotifyTypes::
- TRADE_ADD_PARTNER_OVER_WEIGHT);
- break;
- case 2:
- NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
- break;
- default:
- NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
- UNIMPLIMENTEDPACKET;
- break;
- }
-}
-
-void TradeHandler::processTradeUndo(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- // +++ here need clear trade window from partner side?
-}
-
} // namespace EAthena
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index 111b47547..de35eb9dd 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -53,20 +53,6 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
void finish() const override final;
void cancel() const override final;
-
- protected:
- static void processTradeRequest(Net::MessageIn &msg);
-
- static void processTradeResponse(Net::MessageIn &msg);
-
- static void processTradeUndo(Net::MessageIn &msg);
-
- static void processTradeItemAdd(Net::MessageIn &msg);
-
- static void processTradeItemAddResponse(Net::MessageIn &msg);
-
- static int mQuantity;
- static int mItemIndex;
};
} // namespace EAthena
diff --git a/src/net/eathena/traderecv.cpp b/src/net/eathena/traderecv.cpp
new file mode 100644
index 000000000..6f19302a8
--- /dev/null
+++ b/src/net/eathena/traderecv.cpp
@@ -0,0 +1,162 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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
+ * 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,
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/traderecv.h"
+
+#include "inventory.h"
+#include "item.h"
+#include "itemcolormanager.h"
+#include "notifymanager.h"
+
+#include "being/playerinfo.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "gui/windows/tradewindow.h"
+
+#include "net/ea/traderecv.h"
+
+#include "net/eathena/messageout.h"
+#include "net/eathena/protocol.h"
+
+#include "net/ea/eaprotocol.h"
+
+#include "debug.h"
+
+extern Net::TradeHandler *tradeHandler;
+
+namespace EAthena
+{
+
+namespace TradeRecv
+{
+ int mQuantity = 0;
+ int mItemIndex = -1;
+} // namespace TradeRecv
+
+void TradeRecv::processTradeRequest(Net::MessageIn &msg)
+{
+ const std::string &partner = msg.readString(24, "name");
+ msg.readInt32("char id");
+ msg.readInt16("base level");
+ Ea::TradeRecv::processTradeRequestContinue(partner);
+}
+
+void TradeRecv::processTradeResponse(Net::MessageIn &msg)
+{
+ const uint8_t type = msg.readUInt8("type");
+ msg.readInt32("char id");
+ msg.readInt16("base level");
+ Ea::TradeRecv::processTradeResponseContinue(type);
+}
+
+void TradeRecv::processTradeItemAdd(Net::MessageIn &msg)
+{
+ const int type = msg.readInt16("type");
+ const int itemType = msg.readUInt8("item type");
+ const int amount = msg.readInt32("amount");
+ const uint8_t identify = msg.readUInt8("identify");
+ const Damaged damaged = fromBool(msg.readUInt8("attribute"), Damaged);
+ const uint8_t refine = msg.readUInt8("refine");
+ int cards[4];
+ for (int f = 0; f < 4; f++)
+ cards[f] = msg.readInt16("card");
+
+ if (tradeWindow)
+ {
+ if (type == 0)
+ {
+ tradeWindow->setMoney(amount);
+ }
+ else
+ {
+ tradeWindow->addItem2(type,
+ itemType,
+ cards,
+ 4,
+ false,
+ amount,
+ refine,
+ ItemColorManager::getColorFromCards(&cards[0]),
+ fromBool(identify, Identified),
+ damaged,
+ Favorite_false,
+ Equipm_false);
+ }
+ }
+}
+
+void TradeRecv::processTradeItemAddResponse(Net::MessageIn &msg)
+{
+ msg.readInt16("index");
+ const uint8_t res = msg.readUInt8("fail");
+ switch (res)
+ {
+ case 0: // Successfully added item
+ case 9: // silent added item
+ {
+ Item *const item = PlayerInfo::getInventory()->getItem(
+ mItemIndex);
+ if (!item)
+ return;
+ if (tradeWindow)
+ {
+ tradeWindow->addItem2(item->getId(),
+ item->getType(),
+ item->getCards(),
+ 4,
+ true,
+ mQuantity,
+ item->getRefine(),
+ item->getColor(),
+ item->getIdentified(),
+ item->getDamaged(),
+ item->getFavorite(),
+ item->isEquipment());
+ }
+ item->increaseQuantity(-mQuantity);
+ mItemIndex = -1;
+ mQuantity = 0;
+ break;
+ }
+ case 1:
+ // Add item failed - player overweighted
+ NotifyManager::notify(NotifyTypes::
+ TRADE_ADD_PARTNER_OVER_WEIGHT);
+ break;
+ case 2:
+ NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
+ break;
+ default:
+ NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
+ UNIMPLIMENTEDPACKET;
+ break;
+ }
+}
+
+void TradeRecv::processTradeUndo(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ // +++ here need clear trade window from partner side?
+}
+
+} // namespace EAthena
diff --git a/src/net/eathena/traderecv.h b/src/net/eathena/traderecv.h
new file mode 100644
index 000000000..dfbeff737
--- /dev/null
+++ b/src/net/eathena/traderecv.h
@@ -0,0 +1,45 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * 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
+ * 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,
+ * 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_TRADERECV_H
+#define NET_EATHENA_TRADERECV_H
+
+#include "net/ea/tradehandler.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+ namespace TradeRecv
+ {
+ extern int mQuantity;
+ extern int mItemIndex;
+
+ void processTradeRequest(Net::MessageIn &msg);
+ void processTradeResponse(Net::MessageIn &msg);
+ void processTradeUndo(Net::MessageIn &msg);
+ void processTradeItemAdd(Net::MessageIn &msg);
+ void processTradeItemAddResponse(Net::MessageIn &msg);
+ } // namespace TradeRecv
+} // namespace EAthena
+
+#endif // NET_EATHENA_TRADERECV_H