diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-08-30 17:29:50 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-08-30 17:29:50 +0300 |
commit | 4d03a4b3e2c1a6571f41e75239d6767dcf44e918 (patch) | |
tree | 47dc81a74b34f77203ba77ab5564c97133c27189 /src | |
parent | 7e4752efe67acd3668724c2be69b445e2019c268 (diff) | |
download | manaplus-4d03a4b3e2c1a6571f41e75239d6767dcf44e918.tar.gz manaplus-4d03a4b3e2c1a6571f41e75239d6767dcf44e918.tar.bz2 manaplus-4d03a4b3e2c1a6571f41e75239d6767dcf44e918.tar.xz manaplus-4d03a4b3e2c1a6571f41e75239d6767dcf44e918.zip |
Remove additional parameters from processBeingChatLook function.
Diffstat (limited to 'src')
-rw-r--r-- | src/net/ea/beinghandler.h | 3 | ||||
-rw-r--r-- | src/net/eathena/beinghandler.cpp | 7 | ||||
-rw-r--r-- | src/net/eathena/beinghandler.h | 5 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.cpp | 7 | ||||
-rw-r--r-- | src/net/tmwa/beinghandler.h | 3 |
5 files changed, 9 insertions, 16 deletions
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h index 293ef92e1..6f4a28668 100644 --- a/src/net/ea/beinghandler.h +++ b/src/net/ea/beinghandler.h @@ -62,9 +62,6 @@ class BeingHandler notfinal : public Net::BeingHandler virtual void processBeingEmotion(Net::MessageIn &msg) const; - virtual void processBeingChangeLook(Net::MessageIn &msg, - const bool look2) const = 0; - virtual void processNameResponse(Net::MessageIn &msg) const; virtual void processIpResponse(Net::MessageIn &msg) const; diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 35c183569..54626ce3c 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -146,8 +146,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) case SMSG_BEING_CHANGE_LOOKS: case SMSG_BEING_CHANGE_LOOKS2: - processBeingChangeLook(msg, - msg.getId() == SMSG_BEING_CHANGE_LOOKS2); + processBeingChangeLook(msg); break; case SMSG_BEING_NAME_RESPONSE: @@ -245,8 +244,7 @@ void BeingHandler::undress(Being *const being) const // being->setSprite(SPRITE_WEAPON, 0, "", true); } -void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, - const bool look2) const +void BeingHandler::processBeingChangeLook(Net::MessageIn &msg) const { if (!actorManager) return; @@ -271,6 +269,7 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, int id = 0; unsigned int id2 = 0U; const std::string color; + const bool look2 = msg.getId() == SMSG_BEING_CHANGE_LOOKS2; if (!look2) { diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index fdbde2afa..34cce3dc6 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -44,10 +44,9 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler void undress(Being *const being) const override final; protected: - void processBeingVisibleOrMove(Net::MessageIn &msg); + void processBeingChangeLook(Net::MessageIn &msg) const; - void processBeingChangeLook(Net::MessageIn &msg, - const bool look2) const; + void processBeingVisibleOrMove(Net::MessageIn &msg); static void processNameResponse2(Net::MessageIn &msg); diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index a9c98d295..b66ad64be 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -154,8 +154,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) case SMSG_BEING_CHANGE_LOOKS: case SMSG_BEING_CHANGE_LOOKS2: - processBeingChangeLook(msg, - msg.getId() == SMSG_BEING_CHANGE_LOOKS2); + processBeingChangeLook(msg); break; case SMSG_BEING_NAME_RESPONSE: @@ -254,8 +253,7 @@ void BeingHandler::undress(Being *const being) const // being->setSprite(SPRITE_WEAPON, 0, "", true); } -void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, - const bool look2) const +void BeingHandler::processBeingChangeLook(Net::MessageIn &msg) const { BLOCK_START("BeingHandler::processBeingChangeLook") if (!actorManager) @@ -287,6 +285,7 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, int16_t id = 0; int id2 = 0; const std::string color; + const bool look2 = msg.getId() == SMSG_BEING_CHANGE_LOOKS2; if (!look2) { diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h index 870ea4a1a..235b4da9d 100644 --- a/src/net/tmwa/beinghandler.h +++ b/src/net/tmwa/beinghandler.h @@ -44,8 +44,7 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler void undress(Being *const being) const override final; protected: - void processBeingChangeLook(Net::MessageIn &msg, - const bool look2) const; + void processBeingChangeLook(Net::MessageIn &msg) const; void processBeingVisibleOrMove(Net::MessageIn &msg); |