diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-04 18:49:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-06 01:18:57 +0300 |
| commit | 964fd34057c27c5b9ba0df94a6114968433bbf7e (patch) | |
| tree | c75f7d05e3d83b0bbc1b672f05b427a9fd302837 | |
| parent | 66c15abcf5af44cde75372a8089ac664f9308794 (diff) | |
| download | manaplus-964fd34057c27c5b9ba0df94a6114968433bbf7e.tar.gz manaplus-964fd34057c27c5b9ba0df94a6114968433bbf7e.tar.bz2 manaplus-964fd34057c27c5b9ba0df94a6114968433bbf7e.tar.xz manaplus-964fd34057c27c5b9ba0df94a6114968433bbf7e.zip | |
eathena: fix packet SMSG_TRADE_REQUEST 0x01f4.
| -rw-r--r-- | src/net/eathena/protocol.h | 2 | ||||
| -rw-r--r-- | src/net/eathena/tradehandler.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h index eba7edc77..da630fae0 100644 --- a/src/net/eathena/protocol.h +++ b/src/net/eathena/protocol.h @@ -126,7 +126,7 @@ #define SMSG_WALK_RESPONSE 0x0087 // Receiving a request to trade -#define SMSG_TRADE_REQUEST 0x00e5 +#define SMSG_TRADE_REQUEST 0x01f4 #define SMSG_TRADE_RESPONSE 0x00e7 #define SMSG_TRADE_ITEM_ADD 0x00e9 #define SMSG_TRADE_ITEM_ADD_RESPONSE 0x01b1 /**< Not standard eAthena! */ diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 1d9fabaa0..0e893caf9 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -148,7 +148,10 @@ void TradeHandler::cancel() const void TradeHandler::processTradeRequest(Net::MessageIn &msg) const { - processTradeRequestContinue(msg.readString(24, "name")); + const std::string &partner = msg.readString(24, "name"); + msg.readInt32("char id"); + msg.readInt16("base level"); + processTradeRequestContinue(partner); } } // namespace EAthena |