diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-02-01 01:13:14 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-02-01 01:13:14 +0300 |
| commit | 24902ba328260cb496c62e236a644ebb990e3fd4 (patch) | |
| tree | fd9ee8f2759566f29076eb63689802b40fe13756 /src/net/eathena/npchandler.cpp | |
| parent | 2c273a20b2cd3e1628840f2d87df16f0cce9ad33 (diff) | |
| download | mv-24902ba328260cb496c62e236a644ebb990e3fd4.tar.gz mv-24902ba328260cb496c62e236a644ebb990e3fd4.tar.bz2 mv-24902ba328260cb496c62e236a644ebb990e3fd4.tar.xz mv-24902ba328260cb496c62e236a644ebb990e3fd4.zip | |
Store interacted npc type before buy or talk and send it to buy dialog.
Diffstat (limited to 'src/net/eathena/npchandler.cpp')
| -rw-r--r-- | src/net/eathena/npchandler.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index f5b06ff29..f8041940c 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -35,6 +35,8 @@ #include "net/ea/npcrecv.h" #include "net/eathena/messageout.h" +#include "net/eathena/npcrecv.h" + #include "net/eathena/protocolout.h" #include "resources/item/shopitem.h" @@ -52,11 +54,14 @@ NpcHandler::NpcHandler() : npcHandler = this; } -void NpcHandler::talk(const BeingId npcId) const +void NpcHandler::talk(const Being *const being) const { + if (!being) + return; createOutPacket(CMSG_NPC_TALK); - outMsg.writeBeingId(npcId, "npc id"); + outMsg.writeBeingId(being->getId(), "npc id"); outMsg.writeInt8(0, "unused"); + EAthena::NpcRecv::mNpcTypeId = being->getSubType(); } void NpcHandler::nextDialog(const BeingId npcId) const @@ -108,11 +113,14 @@ void NpcHandler::stringInput(const BeingId npcId, outMsg.writeInt8(0, "null byte"); } -void NpcHandler::buy(const BeingId beingId) const +void NpcHandler::buy(const Being *const being) const { + if (!being) + return; createOutPacket(CMSG_NPC_BUY_SELL_REQUEST); - outMsg.writeBeingId(beingId, "npc id"); + outMsg.writeBeingId(being->getId(), "npc id"); outMsg.writeInt8(0, "action"); + EAthena::NpcRecv::mNpcTypeId = being->getSubType(); } void NpcHandler::sell(const BeingId beingId) const |