summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-17 23:03:03 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-17 23:03:03 +0300
commit84b67aacfdedd8d526d246e3d3c0914a899d491c (patch)
treeee24b23538b0e68cf8addb5240fbdc2182247006 /src/net/tmwa
parent0567d32aa605e66563abdb34d998cce18cea3cc2 (diff)
downloadmanaverse-84b67aacfdedd8d526d246e3d3c0914a899d491c.tar.gz
manaverse-84b67aacfdedd8d526d246e3d3c0914a899d491c.tar.bz2
manaverse-84b67aacfdedd8d526d246e3d3c0914a899d491c.tar.xz
manaverse-84b67aacfdedd8d526d246e3d3c0914a899d491c.zip
Add static in npchandler.
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/npchandler.cpp6
-rw-r--r--src/net/tmwa/npchandler.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 0cc7c6dbf..5f8ff0b21 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -291,7 +291,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg)
void NpcHandler::processNpcCommand(Net::MessageIn &msg)
{
- const int npcId = getNpc(msg);
+ const int npcId = npcHandler->getNpc(msg);
mRequestLang = false;
const int cmd = msg.readInt16();
@@ -334,7 +334,7 @@ void NpcHandler::processNpcCommand(Net::MessageIn &msg)
}
break;
case 5: // close dialog
- closeDialog(npcId);
+ npcHandler->closeDialog(npcId);
break;
case 6: // show avatar
if (mDialog)
@@ -376,7 +376,7 @@ void NpcHandler::processNpcCommand(Net::MessageIn &msg)
void NpcHandler::processChangeTitle(Net::MessageIn &msg)
{
- getNpc(msg);
+ npcHandler->getNpc(msg);
mRequestLang = false;
const std::string str = msg.readString();
if (mDialog)
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index d73e9c71d..476e62a64 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -69,9 +69,9 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
int getNpc(Net::MessageIn &msg) override final;
- void processNpcCommand(Net::MessageIn &msg);
+ static void processNpcCommand(Net::MessageIn &msg);
- void processChangeTitle(Net::MessageIn &msg);
+ static void processChangeTitle(Net::MessageIn &msg);
void produceMix(const int nameId,
const int materialId1,