From f6be620b3f688a4ef4bb3983d9d5fe8afef7f013 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 Sep 2014 13:36:05 +0300
Subject: Remove additional parameters from most npchandlers.

---
 src/net/tmwa/npchandler.cpp | 35 ++++++++++-------------------------
 src/net/tmwa/npchandler.h   |  7 ++-----
 2 files changed, 12 insertions(+), 30 deletions(-)

(limited to 'src/net/tmwa')

diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 3a9ee00a9..4c96eac21 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -45,8 +45,7 @@ namespace TmwAthena
 
 NpcHandler::NpcHandler() :
     MessageHandler(),
-    Ea::NpcHandler(),
-    mRequestLang(false)
+    Ea::NpcHandler()
 {
     static const uint16_t _messages[] =
     {
@@ -71,32 +70,22 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_NPC_CHOICE:
-            getNpc(msg);
-            mRequestLang = false;
             processNpcChoice(msg);
             break;
 
         case SMSG_NPC_MESSAGE:
-            getNpc(msg);
-            mRequestLang = false;
             processNpcMessage(msg);
             break;
 
         case SMSG_NPC_CLOSE:
-            getNpc(msg);
-            mRequestLang = false;
             processNpcClose(msg);
             break;
 
         case SMSG_NPC_NEXT:
-            getNpc(msg);
-            mRequestLang = false;
             processNpcNext(msg);
             break;
 
         case SMSG_NPC_INT_INPUT:
-            getNpc(msg);
-            mRequestLang = false;
             processNpcIntInput(msg);
             break;
 
@@ -111,20 +100,12 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
         }
 
         case SMSG_NPC_COMMAND:
-        {
-            const int npcId = getNpc(msg);
-            mRequestLang = false;
-            processNpcCommand(msg, npcId);
+            processNpcCommand(msg);
             break;
-        }
 
         case SMSG_NPC_CHANGETITLE:
-        {
-            const int npcId = getNpc(msg);
-            mRequestLang = false;
-            processChangeTitle(msg, npcId);
+            processChangeTitle(msg);
             break;
-        }
 
         default:
             break;
@@ -279,8 +260,11 @@ int NpcHandler::getNpc(Net::MessageIn &msg)
     return npcId;
 }
 
-void NpcHandler::processNpcCommand(Net::MessageIn &msg, const int npcId)
+void NpcHandler::processNpcCommand(Net::MessageIn &msg)
 {
+    const int npcId = getNpc(msg);
+    mRequestLang = false;
+
     const int cmd = msg.readInt16();
     switch (cmd)
     {
@@ -368,9 +352,10 @@ void NpcHandler::processLangReuqest(Net::MessageIn &msg A_UNUSED,
     stringInput(npcId, getLangSimple());
 }
 
-void NpcHandler::processChangeTitle(Net::MessageIn &msg,
-                                    const int npcId A_UNUSED) const
+void NpcHandler::processChangeTitle(Net::MessageIn &msg)
 {
+    const int npcId = getNpc(msg);
+    mRequestLang = false;
     const std::string str = msg.readString();
     if (mDialog)
         mDialog->setCaption(str);
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 55dfdd315..a7684ff07 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -67,14 +67,11 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
 
         int getNpc(Net::MessageIn &msg) override final;
 
-        void processNpcCommand(Net::MessageIn &msg, const int npcId);
+        void processNpcCommand(Net::MessageIn &msg);
 
         void processLangReuqest(Net::MessageIn &msg, const int npcId);
 
-        void processChangeTitle(Net::MessageIn &msg, const int npcId) const;
-
-    private:
-        bool mRequestLang;
+        void processChangeTitle(Net::MessageIn &msg);
 };
 
 }  // namespace TmwAthena
-- 
cgit v1.2.3-70-g09d2