summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/npchandler.cpp22
-rw-r--r--src/net/eathena/npchandler.h2
2 files changed, 14 insertions, 10 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 76ae7d3b5..a15d6480e 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -65,32 +65,32 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_NPC_CHOICE:
- getNpc(msg, true);
+ getNpc(msg);
processNpcChoice(msg);
break;
case SMSG_NPC_MESSAGE:
- getNpc(msg, true);
+ getNpc(msg);
processNpcMessage(msg);
break;
case SMSG_NPC_CLOSE:
- getNpc(msg, false);
+ getNpc(msg);
processNpcClose(msg);
break;
case SMSG_NPC_NEXT:
- getNpc(msg, false);
+ getNpc(msg);
processNpcNext(msg);
break;
case SMSG_NPC_INT_INPUT:
- getNpc(msg, false);
+ getNpc(msg);
processNpcIntInput(msg);
break;
case SMSG_NPC_STR_INPUT:
- getNpc(msg, false);
+ getNpc(msg);
processNpcStrInput(msg);
break;
@@ -99,7 +99,7 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
break;
case SMSG_NPC_VIEWPOINT:
- getNpc(msg, true);
+ npcId = getNpc(msg);
processNpcViewPoint(msg, npcId);
break;
@@ -196,10 +196,14 @@ void NpcHandler::sellItem(const int beingId A_UNUSED,
outMsg.writeInt16(static_cast<int16_t>(amount));
}
-int NpcHandler::getNpc(Net::MessageIn &msg, const bool haveLength)
+int NpcHandler::getNpc(Net::MessageIn &msg)
{
- if (haveLength)
+ if (msg.getId() == SMSG_NPC_CHOICE
+ || msg.getId() == SMSG_NPC_MESSAGE
+ || msg.getId() == SMSG_NPC_VIEWPOINT)
+ {
msg.readInt16(); // length
+ }
const int npcId = msg.readInt32();
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index 8c2f61b55..68f64e072 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -65,7 +65,7 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
void sellItem(const int beingId, const int itemId,
const int amount) const override final;
- int getNpc(Net::MessageIn &msg, const bool haveLength) override final;
+ int getNpc(Net::MessageIn &msg) override final;
static void processNpcCutin(Net::MessageIn &msg, const int npcId);