summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-09 11:22:59 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-09 11:22:59 +0300
commitf580ee13d492ad7971fe3828a9dc59ce8aafbc27 (patch)
treed9353d807504b9dddb15cdaea88447464ceed161
parent2f6d82e85aed4fe91bda5962572188ee6b8afa02 (diff)
downloadmv-f580ee13d492ad7971fe3828a9dc59ce8aafbc27.tar.gz
mv-f580ee13d492ad7971fe3828a9dc59ce8aafbc27.tar.bz2
mv-f580ee13d492ad7971fe3828a9dc59ce8aafbc27.tar.xz
mv-f580ee13d492ad7971fe3828a9dc59ce8aafbc27.zip
eathena: impliment packet CMSG_NPC_COMPLETE_PROGRESS_BAR 0x02f1.
-rw-r--r--src/net/eathena/npchandler.cpp5
-rw-r--r--src/net/eathena/npchandler.h2
-rw-r--r--src/net/eathena/protocol.h1
-rw-r--r--src/net/npchandler.h2
-rw-r--r--src/net/tmwa/npchandler.cpp4
-rw-r--r--src/net/tmwa/npchandler.h2
6 files changed, 16 insertions, 0 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 5ae4c4084..b22b0d804 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -194,6 +194,11 @@ void NpcHandler::sellItem(const int beingId A_UNUSED,
outMsg.writeInt16(static_cast<int16_t>(amount));
}
+void NpcHandler::completeProgressBar() const
+{
+ MessageOut outMsg(CMSG_NPC_COMPLETE_PROGRESS_BAR);
+}
+
int NpcHandler::getNpc(Net::MessageIn &msg)
{
if (msg.getId() == SMSG_NPC_CHOICE
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index 90f9627c9..85c95e68e 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -65,6 +65,8 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
void sellItem(const int beingId, const int itemId,
const int amount) const override final;
+ void completeProgressBar() const override final;
+
int getNpc(Net::MessageIn &msg) override final;
protected:
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index 9b1bff51e..560bf02d9 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -308,6 +308,7 @@
#define CMSG_IGNORE_ALL 0x00d0
#define CMSG_REQUEST_RANKS 0x097c
#define CMSG_SET_SHORTCUTS 0x02ba
+#define CMSG_NPC_COMPLETE_PROGRESS_BAR 0x02f1
#define SMSG_SOLVE_CHAR_NAME 0x0194
#define SMSG_SKILL_CASTING 0x07fb
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index dbca9ab38..4412a49f8 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -67,6 +67,8 @@ class NpcHandler notfinal
const int amount) const = 0;
virtual void endShopping(const int beingId) const = 0;
+
+ virtual void completeProgressBar() const = 0;
};
} // namespace Net
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 81b1b9222..b70d1d8b2 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -203,6 +203,10 @@ void NpcHandler::sellItem(const int beingId A_UNUSED,
outMsg.writeInt16(static_cast<int16_t>(amount));
}
+void NpcHandler::completeProgressBar() const
+{
+}
+
int NpcHandler::getNpc(Net::MessageIn &msg)
{
if (msg.getId() == SMSG_NPC_CHOICE
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index aeb1410e3..2d53414e6 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -65,6 +65,8 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
void sellItem(const int beingId, const int itemId,
const int amount) const override final;
+ void completeProgressBar() const override final;
+
int getNpc(Net::MessageIn &msg) override final;
void processNpcCommand(Net::MessageIn &msg);