summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-12-16 16:52:42 +0300
committerAndrei Karas <akaras@inbox.ru>2014-12-16 16:52:42 +0300
commit5fb0cfc6d741fc1791172f374ed4ac666e73144f (patch)
tree5ba142782c83fe713709cc816cb03d7405a7bc47 /src
parent901b607d96bb59c012e679918d9ca083d2ad3c2f (diff)
downloadplus-5fb0cfc6d741fc1791172f374ed4ac666e73144f.tar.gz
plus-5fb0cfc6d741fc1791172f374ed4ac666e73144f.tar.bz2
plus-5fb0cfc6d741fc1791172f374ed4ac666e73144f.tar.xz
plus-5fb0cfc6d741fc1791172f374ed4ac666e73144f.zip
eathena: rename packet SMSG_TRADE_RESPONSE2 into SMSG_TRADE_RESPONSE.
Diffstat (limited to 'src')
-rw-r--r--src/net/eathena/protocol.h2
-rw-r--r--src/net/eathena/tradehandler.cpp8
-rw-r--r--src/net/eathena/tradehandler.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 9bcdcf740..b87f26311 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -160,7 +160,7 @@
// Receiving a request to trade
#define SMSG_TRADE_REQUEST 0x01f4
-#define SMSG_TRADE_RESPONSE2 0x01f5
+#define SMSG_TRADE_RESPONSE 0x01f5
#define SMSG_TRADE_ITEM_ADD 0x080f
#define SMSG_TRADE_ITEM_ADD_RESPONSE 0x00ea
#define SMSG_TRADE_OK 0x00ec
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index acd4090b6..88bcceb10 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -55,7 +55,7 @@ TradeHandler::TradeHandler() :
static const uint16_t _messages[] =
{
SMSG_TRADE_REQUEST,
- SMSG_TRADE_RESPONSE2,
+ SMSG_TRADE_RESPONSE,
SMSG_TRADE_ITEM_ADD,
SMSG_TRADE_ITEM_ADD_RESPONSE,
SMSG_TRADE_OK,
@@ -79,8 +79,8 @@ void TradeHandler::handleMessage(Net::MessageIn &msg)
processTradeRequest(msg);
break;
- case SMSG_TRADE_RESPONSE2:
- processTradeResponse2(msg);
+ case SMSG_TRADE_RESPONSE:
+ processTradeResponse(msg);
break;
case SMSG_TRADE_ITEM_ADD:
@@ -173,7 +173,7 @@ void TradeHandler::processTradeRequest(Net::MessageIn &msg)
processTradeRequestContinue(partner);
}
-void TradeHandler::processTradeResponse2(Net::MessageIn &msg)
+void TradeHandler::processTradeResponse(Net::MessageIn &msg)
{
const uint8_t type = msg.readUInt8("type");
msg.readInt32("char id");
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index ccfee1101..c2ae2d4f9 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -57,7 +57,7 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
protected:
static void processTradeRequest(Net::MessageIn &msg);
- static void processTradeResponse2(Net::MessageIn &msg);
+ static void processTradeResponse(Net::MessageIn &msg);
static void processTradeUndo(Net::MessageIn &msg);