diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-09-07 19:26:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-09-07 19:26:12 +0300 |
| commit | 6e2a02c73e54648c7eefe2cb8cfc99a285fed868 (patch) | |
| tree | 6f5a47590d861bbbb8065a203de054b1f9503303 /src/net/eathena/npchandler.cpp | |
| parent | e06101a4c8633a43d813d4a62bde2d9f49c128bf (diff) | |
| download | manaplus-6e2a02c73e54648c7eefe2cb8cfc99a285fed868.tar.gz manaplus-6e2a02c73e54648c7eefe2cb8cfc99a285fed868.tar.bz2 manaplus-6e2a02c73e54648c7eefe2cb8cfc99a285fed868.tar.xz manaplus-6e2a02c73e54648c7eefe2cb8cfc99a285fed868.zip | |
Split protocol.h into protocolin.h and protocolout.h
Diffstat (limited to 'src/net/eathena/npchandler.cpp')
| -rw-r--r-- | src/net/eathena/npchandler.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 00afb763b..74474b08f 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -34,7 +34,8 @@ #include "net/ea/npcrecv.h" #include "net/eathena/messageout.h" -#include "net/eathena/protocol.h" +#include "net/eathena/protocolin.h" +#include "net/eathena/protocolout.h" #include "debug.h" @@ -197,6 +198,7 @@ void NpcHandler::selectAutoSpell(const int skillId) const BeingId NpcHandler::getNpc(Net::MessageIn &msg) { + // +++ must be removed SMSG_* if (msg.getId() == SMSG_NPC_CHOICE || msg.getId() == SMSG_NPC_MESSAGE || msg.getId() == SMSG_NPC_CHANGETITLE) @@ -209,11 +211,13 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg) const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId); Ea::NpcRecv::mDialog = nullptr; + // +++ must be removed SMSG_* if (msg.getId() == SMSG_NPC_VIEWPOINT) return npcId; if (diag == NpcDialog::mNpcDialogs.end()) { + // +++ must be removed SMSG_* // Empty dialogs don't help if (msg.getId() == SMSG_NPC_CLOSE) { |