diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-07-27 20:51:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-07-27 20:51:14 +0300 |
| commit | f0a0e1eff7be666ec963440de0a1fbcddf1d407e (patch) | |
| tree | 447f8d04a19db075430120ef406d662c44700df0 | |
| parent | b27338573f455ac730e6bcca9d46b50391ddf7b3 (diff) | |
| download | manaplus-f0a0e1eff7be666ec963440de0a1fbcddf1d407e.tar.gz manaplus-f0a0e1eff7be666ec963440de0a1fbcddf1d407e.tar.bz2 manaplus-f0a0e1eff7be666ec963440de0a1fbcddf1d407e.tar.xz manaplus-f0a0e1eff7be666ec963440de0a1fbcddf1d407e.zip | |
Add packet CMSG_PLAYER_SELECT_STYLE 0x0afc.
| -rw-r--r-- | src/net/eathena/packetsout.inc | 6 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.cpp | 6 | ||||
| -rw-r--r-- | src/net/eathena/playerhandler.h | 3 | ||||
| -rw-r--r-- | src/net/playerhandler.h | 3 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.cpp | 3 | ||||
| -rw-r--r-- | src/net/tmwa/playerhandler.h | 3 |
6 files changed, 19 insertions, 5 deletions
diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 59926bbdb..f2b54ddfd 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -1413,4 +1413,10 @@ if (packetVersionRe >= 20180704) packet(CMSG_PRIVATE_AIRSHIP_REQUEST, 0x0a49, 22, clif->pPrivateAirshipRequest); } +// 20180718 re +if (packetVersionRe >= 20180718) +{ + packet(CMSG_PLAYER_SELECT_STYLE, 0x0afc, 16, clif->pReqStyleChange); +} + #endif diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index 0380ec098..a70d130cf 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -46,6 +46,7 @@ #include "debug.h" extern int packetVersion; +extern int packetVersionRe; extern int serverVersion; namespace EAthena @@ -795,7 +796,8 @@ void PlayerHandler::selectStyle(const int headColor, const int bodyColor, const int topStyle, const int middleStyle, - const int bottomStyle) const + const int bottomStyle, + const int bodyStyle) const { if (packetVersion < 20151104) return; @@ -806,6 +808,8 @@ void PlayerHandler::selectStyle(const int headColor, outMsg.writeInt16(CAST_S16(topStyle), "top style"); outMsg.writeInt16(CAST_S16(middleStyle), "middle style"); outMsg.writeInt16(CAST_S16(bottomStyle), "bottom style"); + if (packetVersionRe >= 20180718) + outMsg.writeInt16(CAST_S16(bodyStyle), "body style"); } #undef setStatComplex diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index 1a46a6427..887f652f6 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -75,7 +75,8 @@ class PlayerHandler final : public Ea::PlayerHandler const int bodyColor, const int topStyle, const int middleStyle, - const int bottomStyle) const override final; + const int bottomStyle, + const int bodyStyle) const override final; void setStat(Net::MessageIn &msg, const int type, diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 2d8db0142..ae4c1f61f 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -117,7 +117,8 @@ class PlayerHandler notfinal const int bodyColor, const int topStyle, const int middleStyle, - const int bottomStyle) const = 0; + const int bottomStyle, + const int bodyStyle) const = 0; }; } // namespace Net diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index ffc1b3176..362269ab9 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -500,7 +500,8 @@ void PlayerHandler::selectStyle(const int headColor A_UNUSED, const int bodyColor A_UNUSED, const int topStyle A_UNUSED, const int middleStyle A_UNUSED, - const int bottomStyle A_UNUSED) const + const int bottomStyle A_UNUSED, + const int bodyStyle A_UNUSED) const { } diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index 044fc47d4..418843989 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -86,7 +86,8 @@ class PlayerHandler final : public Ea::PlayerHandler const int bodyColor, const int topStyle, const int middleStyle, - const int bottomStyle) const override final; + const int bottomStyle, + const int bodyStyle) const override final; void setStat(Net::MessageIn &msg, const int type, |