summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-03-17 23:33:37 +0300
committerAndrei Karas <akaras@inbox.ru>2015-03-17 23:33:37 +0300
commit1b43cc5755ca5157f56b4222c2fc05e608d0fe93 (patch)
tree340234d377788640caa9914843470feb2e92ddfc
parentf406fe1a4c6abf9b414fc9110cef80e217cafb62 (diff)
downloadmanaplus-1b43cc5755ca5157f56b4222c2fc05e608d0fe93.tar.gz
manaplus-1b43cc5755ca5157f56b4222c2fc05e608d0fe93.tar.bz2
manaplus-1b43cc5755ca5157f56b4222c2fc05e608d0fe93.tar.xz
manaplus-1b43cc5755ca5157f56b4222c2fc05e608d0fe93.zip
eathena: add partial support for packet SMSG_NPC_PROGRESS_BAR_ABORT 0x02f2.
-rw-r--r--src/net/eathena/npchandler.cpp10
-rw-r--r--src/net/eathena/npchandler.h2
-rw-r--r--src/net/eathena/packets.h2
-rw-r--r--src/net/eathena/protocol.h1
4 files changed, 14 insertions, 1 deletions
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index b7bd51844..e5ff89cfb 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -60,6 +60,7 @@ NpcHandler::NpcHandler() :
SMSG_NPC_CHANGETITLE,
SMSG_NPC_AREA,
SMSG_NPC_SHOW_DIGIT,
+ SMSG_NPC_PROGRESS_BAR_ABORT,
0
};
handledMessages = _messages;
@@ -126,6 +127,10 @@ void NpcHandler::handleMessage(Net::MessageIn &msg)
processShowDigit(msg);
break;
+ case SMSG_NPC_PROGRESS_BAR_ABORT:
+ processProgressBarAbort(msg);
+ break;
+
default:
break;
}
@@ -387,4 +392,9 @@ void NpcHandler::processShowDigit(Net::MessageIn &msg)
msg.readInt32("value");
}
+void NpcHandler::processProgressBarAbort(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/npchandler.h b/src/net/eathena/npchandler.h
index bfc4e2943..16e656497 100644
--- a/src/net/eathena/npchandler.h
+++ b/src/net/eathena/npchandler.h
@@ -99,6 +99,8 @@ class NpcHandler final : public MessageHandler, public Ea::NpcHandler
static void processArea(Net::MessageIn &msg);
static void processShowDigit(Net::MessageIn &msg);
+
+ static void processProgressBarAbort(Net::MessageIn &msg);
};
} // namespace EAthena
diff --git a/src/net/eathena/packets.h b/src/net/eathena/packets.h
index 17ea394e7..971ecef2a 100644
--- a/src/net/eathena/packets.h
+++ b/src/net/eathena/packets.h
@@ -101,7 +101,7 @@ int16_t packet_lengths[] =
0, -1, 0, 0, 0, 30, 30, 0, 0, 3, 0, 65, 4, 71, 10, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 3, 0, -1, 32, 6, 36,
0, 33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 8,
- 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 10, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
//0 1 2 3 4 5 6 7 8 9 a b c d e f
//0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
// #0x0300
diff --git a/src/net/eathena/protocol.h b/src/net/eathena/protocol.h
index fe95dc6f9..1fce01349 100644
--- a/src/net/eathena/protocol.h
+++ b/src/net/eathena/protocol.h
@@ -183,6 +183,7 @@
#define SMSG_NPC_INT_INPUT 0x0142 /**< Integer input */
#define SMSG_NPC_STR_INPUT 0x01d4 /**< String input */
#define SMSG_NPC_SHOW_PROGRESS_BAR 0x02f0
+#define SMSG_NPC_PROGRESS_BAR_ABORT 0x02f2
#define SMSG_NPC_CHANGETITLE 0x0b06
#define SMSG_NPC_MARKET_OPEN 0x09d5
#define SMSG_NPC_MARKET_BUY_ACK 0x09d7