From 37976a30f4f6ae3cb7fa25a54b640ae37b608bdf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 14 Jul 2018 01:54:02 +0300 Subject: Rename packet CMSG_PLAYER_SET_EQUIPMENT_VISIBLE into CMSG_SET_CONFIG_OPTION. For now unused. --- src/net/eathena/packetsout.inc | 2 +- src/net/eathena/playerhandler.cpp | 9 +++++---- src/net/eathena/playerhandler.h | 3 ++- src/net/playerhandler.h | 3 ++- src/net/tmwa/playerhandler.cpp | 3 ++- src/net/tmwa/playerhandler.h | 3 ++- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index b480c16f4..f74a59ac8 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -92,7 +92,7 @@ packet(CMSG_PLAYER_UNEQUIP, 0x00ab, 4, clif->pUnequipItem); packet(CMSG_PLAYER_USE_CARD, 0x017a, 4, clif->pUseCard); packet(CMSG_PLAYER_INSERT_CARD, 0x017c, 6, clif->pInsertCard); packet(CMSG_PLAYER_VIEW_EQUIPMENT, 0x02d6, 6, clif->pViewPlayerEquip); -packet(CMSG_PLAYER_SET_EQUIPMENT_VISIBLE, 0x02d8, 10, clif->pEquipTick); +packet(CMSG_SET_CONFIG_OPTION, 0x02d8, 10, clif->pEquipTick); packet(CMSG_ITEM_PICKUP, 0x009f, 6, clif->pTakeItem); packet(CMSG_PLAYER_CHANGE_DIR, 0x009b, 5, clif->pChangeDir); diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index e22ca822b..d82e28a05 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -503,11 +503,12 @@ void PlayerHandler::revive() const createOutPacket(CMSG_PLAYER_AUTO_REVIVE); } -void PlayerHandler::setViewEquipment(const bool allow) const +void PlayerHandler::setConfigOption(const int id, + const int data) const { - createOutPacket(CMSG_PLAYER_SET_EQUIPMENT_VISIBLE); - outMsg.writeInt32(0, "unused"); - outMsg.writeInt32(allow ? 1 : 0, "allow"); + createOutPacket(CMSG_SET_CONFIG_OPTION); + outMsg.writeInt32(id, "config option"); + outMsg.writeInt32(data, "config data"); } #define setStatComplex(stat) \ diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h index c98b7f885..1a46a6427 100644 --- a/src/net/eathena/playerhandler.h +++ b/src/net/eathena/playerhandler.h @@ -68,7 +68,8 @@ class PlayerHandler final : public Ea::PlayerHandler void explosionSpirits() const override final; void requestPvpInfo() const override final; void revive() const override final; - void setViewEquipment(const bool allow) const override final; + void setConfigOption(const int id, + const int data) const override final; void selectStyle(const int headColor, const int headStyle, const int bodyColor, diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 58fa582ee..2d8db0142 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -104,7 +104,8 @@ class PlayerHandler notfinal virtual void revive() const = 0; - virtual void setViewEquipment(const bool allow) const = 0; + virtual void setConfigOption(const int id A_UNUSED, + const int data A_UNUSED) const = 0; virtual void setStat(Net::MessageIn &msg, const int type, diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 71b2d55c6..ffc1b3176 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -207,7 +207,8 @@ void PlayerHandler::shortcutShiftRow(const int row A_UNUSED) const { } -void PlayerHandler::setViewEquipment(const bool allow A_UNUSED) const +void PlayerHandler::setConfigOption(const int id A_UNUSED, + const int data A_UNUSED) const { } diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h index b4bfabe02..044fc47d4 100644 --- a/src/net/tmwa/playerhandler.h +++ b/src/net/tmwa/playerhandler.h @@ -78,7 +78,8 @@ class PlayerHandler final : public Ea::PlayerHandler void revive() const override final; - void setViewEquipment(const bool allow) const override final; + void setConfigOption(const int id A_UNUSED, + const int data A_UNUSED) const override final; void selectStyle(const int headColor, const int headStyle, -- cgit v1.2.3-60-g2f50