From 11f548068b7ac05220437f595403ac41cc222a1e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 30 Aug 2015 19:17:09 +0300 Subject: Move receive code from tradehandler into separate file. --- src/net/tmwa/tradehandler.cpp | 130 +++----------------------------- src/net/tmwa/tradehandler.h | 9 --- src/net/tmwa/traderecv.cpp | 168 ++++++++++++++++++++++++++++++++++++++++++ src/net/tmwa/traderecv.h | 41 +++++++++++ 4 files changed, 219 insertions(+), 129 deletions(-) create mode 100644 src/net/tmwa/traderecv.cpp create mode 100644 src/net/tmwa/traderecv.h (limited to 'src/net/tmwa') diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 845a7af6b..35a1c06eb 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -34,8 +34,11 @@ #include "gui/windows/tradewindow.h" +#include "net/ea/traderecv.h" + #include "net/tmwa/messageout.h" #include "net/tmwa/protocol.h" +#include "net/tmwa/traderecv.h" #include "net/ea/eaprotocol.h" @@ -76,31 +79,31 @@ 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; default: @@ -160,117 +163,4 @@ void TradeHandler::cancel() const createOutPacket(CMSG_TRADE_CANCEL_REQUEST); } -void TradeHandler::processTradeRequest(Net::MessageIn &msg) -{ - processTradeRequestContinue(msg.readString(24, "name")); -} - -void TradeHandler::processTradeItemAdd(Net::MessageIn &msg) -{ - const int amount = msg.readInt32("amount"); - const int type = msg.readInt16("type"); - const uint8_t identify = msg.readUInt8("identify"); - msg.readUInt8("attribute"); - 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, - 0, - cards, - 4, - false, - amount, - refine, - ItemColor_one, - fromBool(identify, Identified), - Damaged_false, - Favorite_false, - Equipm_false); - } - } -} - -void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg) -{ - // Trade: New Item add response (was 0x00ea, now 01b1) - const int index = msg.readInt16("index") - INVENTORY_OFFSET; - Item *item = nullptr; - if (PlayerInfo::getInventory()) - item = PlayerInfo::getInventory()->getItem(index); - - if (!item) - { - if (tradeWindow) - tradeWindow->receivedOk(true); - return; - } - const int quantity = msg.readInt16("amount"); - - const uint8_t res = msg.readUInt8("status"); - switch (res) - { - case 0: - // Successfully added item - if (tradeWindow) - { - tradeWindow->addItem2(item->getId(), - item->getType(), - item->getCards(), - 4, - true, - quantity, - item->getRefine(), - item->getColor(), - item->getIdentified(), - item->getDamaged(), - item->getFavorite(), - item->isEquipment()); - } - item->increaseQuantity(-quantity); - break; - case 1: - // Add item failed - player overweighted - NotifyManager::notify(NotifyTypes:: - TRADE_ADD_PARTNER_OVER_WEIGHT); - break; - case 2: - // Add item failed - player has no free slot - NotifyManager::notify(NotifyTypes::TRADE_ADD_PARTNER_NO_SLOTS); - break; - case 3: - // Add item failed - non tradable item - NotifyManager::notify(NotifyTypes::TRADE_ADD_UNTRADABLE_ITEM); - break; - default: - NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR); - UNIMPLIMENTEDPACKET; - logger->log("QQQ SMSG_TRADE_ITEM_ADD_RESPONSE: " - + toString(res)); - break; - } -} - -void TradeHandler::processTradeResponse(Net::MessageIn &msg) -{ - if (tradePartnerName.empty() || - !player_relations.hasPermission(tradePartnerName, - PlayerRelation::TRADE)) - { - tradeHandler->respond(false); - return; - } - const uint8_t type = msg.readUInt8("type"); - processTradeResponseContinue(type); -} - } // namespace TmwAthena diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h index 40ee13334..125131204 100644 --- a/src/net/tmwa/tradehandler.h +++ b/src/net/tmwa/tradehandler.h @@ -53,15 +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 processTradeItemAdd(Net::MessageIn &msg); - - static void processTradeItemAddResponse(Net::MessageIn &msg); - - static void processTradeResponse(Net::MessageIn &msg); }; } // namespace TmwAthena diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp new file mode 100644 index 000000000..fce1576cb --- /dev/null +++ b/src/net/tmwa/traderecv.cpp @@ -0,0 +1,168 @@ +/* + * 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 . + */ + +#include "net/tmwa/traderecv.h" + +#include "inventory.h" +#include "item.h" +#include "notifymanager.h" + +#include "being/playerinfo.h" +#include "being/playerrelation.h" +#include "being/playerrelations.h" + +#include "enums/resources/notifytypes.h" + +#include "gui/windows/tradewindow.h" + +#include "net/ea/traderecv.h" + +#include "net/tmwa/messageout.h" +#include "net/tmwa/protocol.h" + +#include "net/ea/eaprotocol.h" + +#include "utils/stringutils.h" + +#include "debug.h" + +extern Net::TradeHandler *tradeHandler; + +extern std::string tradePartnerName; + +namespace TmwAthena +{ + +void TradeRecv::processTradeRequest(Net::MessageIn &msg) +{ + Ea::TradeRecv::processTradeRequestContinue(msg.readString(24, "name")); +} + +void TradeRecv::processTradeItemAdd(Net::MessageIn &msg) +{ + const int amount = msg.readInt32("amount"); + const int type = msg.readInt16("type"); + const uint8_t identify = msg.readUInt8("identify"); + msg.readUInt8("attribute"); + 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, + 0, + cards, + 4, + false, + amount, + refine, + ItemColor_one, + fromBool(identify, Identified), + Damaged_false, + Favorite_false, + Equipm_false); + } + } +} + +void TradeRecv::processTradeItemAddResponse(Net::MessageIn &msg) +{ + // Trade: New Item add response (was 0x00ea, now 01b1) + const int index = msg.readInt16("index") - INVENTORY_OFFSET; + Item *item = nullptr; + if (PlayerInfo::getInventory()) + item = PlayerInfo::getInventory()->getItem(index); + + if (!item) + { + if (tradeWindow) + tradeWindow->receivedOk(true); + return; + } + const int quantity = msg.readInt16("amount"); + + const uint8_t res = msg.readUInt8("status"); + switch (res) + { + case 0: + // Successfully added item + if (tradeWindow) + { + tradeWindow->addItem2(item->getId(), + item->getType(), + item->getCards(), + 4, + true, + quantity, + item->getRefine(), + item->getColor(), + item->getIdentified(), + item->getDamaged(), + item->getFavorite(), + item->isEquipment()); + } + item->increaseQuantity(-quantity); + break; + case 1: + // Add item failed - player overweighted + NotifyManager::notify(NotifyTypes:: + TRADE_ADD_PARTNER_OVER_WEIGHT); + break; + case 2: + // Add item failed - player has no free slot + NotifyManager::notify(NotifyTypes::TRADE_ADD_PARTNER_NO_SLOTS); + break; + case 3: + // Add item failed - non tradable item + NotifyManager::notify(NotifyTypes::TRADE_ADD_UNTRADABLE_ITEM); + break; + default: + NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR); + UNIMPLIMENTEDPACKET; + logger->log("QQQ SMSG_TRADE_ITEM_ADD_RESPONSE: " + + toString(res)); + break; + } +} + +void TradeRecv::processTradeResponse(Net::MessageIn &msg) +{ + if (tradePartnerName.empty() || + !player_relations.hasPermission(tradePartnerName, + PlayerRelation::TRADE)) + { + tradeHandler->respond(false); + return; + } + const uint8_t type = msg.readUInt8("type"); + Ea::TradeRecv::processTradeResponseContinue(type); +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/traderecv.h b/src/net/tmwa/traderecv.h new file mode 100644 index 000000000..8702478d7 --- /dev/null +++ b/src/net/tmwa/traderecv.h @@ -0,0 +1,41 @@ +/* + * 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 . + */ + +#ifndef NET_TMWA_TRADERECV_H +#define NET_TMWA_TRADERECV_H + +#include "net/ea/tradehandler.h" + +#include "net/tmwa/messagehandler.h" + +namespace TmwAthena +{ + namespace TradeRecv + { + void processTradeRequest(Net::MessageIn &msg); + void processTradeItemAdd(Net::MessageIn &msg); + void processTradeItemAddResponse(Net::MessageIn &msg); + void processTradeResponse(Net::MessageIn &msg); + } // namespace TradeRecv +} // namespace TmwAthena + +#endif // NET_TMWA_TRADERECV_H -- cgit v1.2.3-60-g2f50