diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-06-18 04:13:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-06-18 04:13:26 +0300 |
| commit | bc05e688174d24f3b2b01ee0ab5ce73787817832 (patch) | |
| tree | 93de6e980b161e7dccec2acf98b4621c6c385369 /src/net | |
| parent | 5e11fb3595e752e37557e3e1a1a0590e033daad3 (diff) | |
| download | ManaVerse-bc05e688174d24f3b2b01ee0ab5ce73787817832.tar.gz ManaVerse-bc05e688174d24f3b2b01ee0ab5ce73787817832.tar.bz2 ManaVerse-bc05e688174d24f3b2b01ee0ab5ce73787817832.tar.xz ManaVerse-bc05e688174d24f3b2b01ee0ab5ce73787817832.zip | |
Fix some style issues after automatic checks.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/npchandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/tmwa/npchandler.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 7ec80433a..9a0054b6a 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -327,10 +327,10 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg, const BeingId npcId = msg.readBeingId("npc id"); const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId); - Ea::NpcRecv::mDialog = nullptr; if (diag == NpcDialog::mNpcDialogs.end()) { + Ea::NpcRecv::mDialog = nullptr; // Empty dialogs don't help if (action == NpcAction::Close) { diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index c577bc6a1..df9f40219 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -206,11 +206,10 @@ BeingId NpcHandler::getNpc(Net::MessageIn &msg, const BeingId npcId = msg.readBeingId("npc id"); const NpcDialogs::const_iterator diag = NpcDialog::mNpcDialogs.find(npcId); - Ea::NpcRecv::mDialog = nullptr; if (diag == NpcDialog::mNpcDialogs.end()) { - // +++ must be removed packet id checks from here + Ea::NpcRecv::mDialog = nullptr; // Empty dialogs don't help if (action == NpcAction::Close) { |