From 4d03a4b3e2c1a6571f41e75239d6767dcf44e918 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 30 Aug 2014 17:29:50 +0300
Subject: Remove additional parameters from processBeingChatLook function.
---
src/net/ea/beinghandler.h | 3 ---
src/net/eathena/beinghandler.cpp | 7 +++----
src/net/eathena/beinghandler.h | 5 ++---
src/net/tmwa/beinghandler.cpp | 7 +++----
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);
--
cgit v1.2.3-70-g09d2