From bc05e688174d24f3b2b01ee0ab5ce73787817832 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Jun 2018 04:13:26 +0300 Subject: Fix some style issues after automatic checks. --- src/net/eathena/npchandler.cpp | 2 +- src/net/tmwa/npchandler.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/net') 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) { -- cgit v1.2.3-70-g09d2