diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-05-12 08:11:35 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-05-12 08:12:31 -0600 |
commit | 657afb7b642d5b02289c6bb5bc883c2987cdf5d1 (patch) | |
tree | 26816e7e3f3acfd521844be85423a8b18d2443c5 /src/net/ea/tradehandler.cpp | |
parent | b4d5e2a9c92fe5b0f53c3d08b87c324960c3215c (diff) | |
download | mana-client-657afb7b642d5b02289c6bb5bc883c2987cdf5d1.tar.gz mana-client-657afb7b642d5b02289c6bb5bc883c2987cdf5d1.tar.bz2 mana-client-657afb7b642d5b02289c6bb5bc883c2987cdf5d1.tar.xz mana-client-657afb7b642d5b02289c6bb5bc883c2987cdf5d1.zip |
Remove methods from LocalPlayer that just call Net
And make a few others like that, and remove them too.
Diffstat (limited to 'src/net/ea/tradehandler.cpp')
-rw-r--r-- | src/net/ea/tradehandler.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index ee8e6733..74722332 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -23,6 +23,7 @@ #include "net/ea/protocol.h" +#include "net/inventoryhandler.h" #include "net/messagein.h" #include "net/messageout.h" @@ -48,7 +49,7 @@ namespace { { void action(const gcn::ActionEvent &event) { - player_node->tradeReply(event.getId() == "yes"); + Net::getTradeHandler()->respond(event.getId() == "yes"); } } listener; } @@ -91,7 +92,7 @@ void TradeHandler::handleMessage(MessageIn &msg) { if (!player_node->tradeRequestOk()) { - player_node->tradeReply(false); + Net::getTradeHandler()->respond(false); break; } @@ -104,7 +105,7 @@ void TradeHandler::handleMessage(MessageIn &msg) } else { - player_node->tradeReply(false); + Net::getTradeHandler()->respond(false); break; } break; @@ -183,7 +184,7 @@ void TradeHandler::handleMessage(MessageIn &msg) // Successfully added item if (item->isEquipment() && item->isEquipped()) { - player_node->unequipItem(item); + Net::getInventoryHandler()->unequipItem(item); } tradeWindow->addItem(item->getId(), true, quantity, item->isEquipment()); @@ -236,6 +237,9 @@ void TradeHandler::request(Being *being) void TradeHandler::respond(bool accept) { + if (!accept) + player_node->setTrading(false); + MessageOut outMsg(CMSG_TRADE_RESPONSE); outMsg.writeInt8(accept ? 3 : 4); } |