From 7e4752efe67acd3668724c2be69b445e2019c268 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 30 Aug 2014 17:24:51 +0300 Subject: Remove additional parameters from processBeingVisibleOrMove function. --- src/net/eathena/beinghandler.cpp | 7 ++++--- src/net/eathena/beinghandler.h | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/net/eathena') diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index fe153a474..35c183569 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -109,7 +109,7 @@ void BeingHandler::handleMessage(Net::MessageIn &msg) { case SMSG_BEING_VISIBLE: // changed case SMSG_BEING_MOVE: - processBeingVisibleOrMove(msg, msg.getId() == SMSG_BEING_VISIBLE); + processBeingVisibleOrMove(msg); break; case SMSG_BEING_MOVE2: @@ -628,12 +628,13 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, dstBeing->setMoveTime(); } -void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, - const bool visible) +void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg) { if (!actorManager) return; + const bool visible = msg.getId() == SMSG_BEING_VISIBLE; + if (visible) msg.readUInt8(); // padding? diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h index 54271edff..fdbde2afa 100644 --- a/src/net/eathena/beinghandler.h +++ b/src/net/eathena/beinghandler.h @@ -43,10 +43,9 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler void undress(Being *const being) const override final; - void processBeingVisibleOrMove(Net::MessageIn &msg, - const bool visible) override final; - protected: + void processBeingVisibleOrMove(Net::MessageIn &msg); + void processBeingChangeLook(Net::MessageIn &msg, const bool look2) const; -- cgit v1.2.3-70-g09d2