Merge pull request #2030 from 4144/updatepackets

Update packets.

7 files changed, 38 insertions, 12 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 451b1fb17..4e25a71ae 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -20597,6 +20597,11 @@ void clif_parse_attendance_reward_request(int fd, struct map_session_data *sd)
 #endif
 }
 
+void clif_parse_cz_blocking_play_cancel(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
+void clif_parse_cz_blocking_play_cancel(int fd, struct map_session_data *sd)
+{
+}
+
 void clif_ui_action(struct map_session_data *sd, int32 UIType, int32 data)
 {
 
@@ -21623,6 +21628,7 @@ void clif_defaults(void) {
 	clif->pDebug = clif_parse_debug;
 	clif->pSkillSelectMenu = clif_parse_SkillSelectMenu;
 	clif->pMoveItem = clif_parse_MoveItem;
+	clif->p_cz_blocking_play_cancel = clif_parse_cz_blocking_play_cancel;
 	/* dull */
 	clif->pDull = clif_parse_dull;
 	/* BGQueue */
diff --git a/src/map/clif.h b/src/map/clif.h
index f0eaaf6eb..8622d8729 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1356,6 +1356,7 @@ struct clif_interface {
 	void (*pSkillSelectMenu) (int fd, struct map_session_data *sd);
 	void (*pMoveItem) (int fd, struct map_session_data *sd);
 	void (*pDull) (int fd, struct map_session_data *sd);
+	void (*p_cz_blocking_play_cancel) (int fd, struct map_session_data *sd);
 	/* BGQueue */
 	void (*pBGQueueRegister) (int fd, struct map_session_data *sd);
 	void (*pBGQueueCheckState) (int fd, struct map_session_data *sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index a723463b4..a84a4ae09 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1534,7 +1534,12 @@ packet(0x96e,-1,clif->ackmergeitems);
 	//packet(0x07d4,4);
 	//packet(0x07d5,4);
 	//packet(0x07d6,4);
-	//packet(0x0447,2);
+#endif
+
+// 2009-05-20aRagexe, 2009-05-20aRagexeRE
+#if PACKETVER >= 20090520
+// new packets
+	packet(0x0447,2,clif->p_cz_blocking_play_cancel); // PACKET_CZ_BLOCKING_PLAY_CANCEL
 #endif
 
 //2009-06-03aRagexeRE
@@ -2310,7 +2315,6 @@ packet(0x96e,-1,clif->ackmergeitems);
 	// Shuffle End
 
 	// New Packets (wrong version or packet not exists)
-	packet(0x0447,2); // PACKET_CZ_BLOCKING_PLAY_CANCEL
 	packet(0x099f,24);
 	// New Packets End
 #endif
@@ -3993,7 +3997,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // new packets
 	packet(0x0af2,40,clif->pDull/*,XXX*/);
 	packet(0x0af3,-1,clif->pDull/*,XXX*/);
-	packet(0x0af4,11,clif->pDull/*,XXX*/);
+	packet(0x0af4,11,clif->pUseSkillToPos,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND
 // changed packet sizes
 	packet(0x0ae6,10,clif->pDull/*,XXX*/);
 #endif
@@ -4017,7 +4021,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // 2018-02-07bRagexeRE, 2018-02-07bRagexe
 #if PACKETVER >= 20180207
 // new packets
-	packet(0x0af4,11);
+	packet(0x0af4,11,clif->pUseSkillToPos,2,4,6,8,10);  // CZ_USE_SKILL_TOGROUND
 	packet(0x0af5,3);
 	packet(0x0af6,88);
 	packet(0x0af7,32);
@@ -4096,4 +4100,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 #endif
 #endif
 
+#ifdef PACKETVER_ZERO
+// 2018-04-25_3aRagexe_zero
+#if PACKETVER >= 20180425
+// new packets
+	packet(0x0afb,-1,clif->pDull/*,XXX*/);
+// changed packet sizes
+#endif
+#endif  // PACKETVER_ZERO
+
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_keys_main.h b/src/map/packets_keys_main.h
index 1f6a3ca6d..5890377d6 100644
--- a/src/map/packets_keys_main.h
+++ b/src/map/packets_keys_main.h
@@ -874,7 +874,7 @@
 	packetKeys(0x6A596301,0x76866D0E,0x32294A45);
 #endif
 
-// 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE
+// 2013-12-23aRagexeRE, 2014-05-08aRagexe, 2014-05-08aRagexeRE, 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE
 #if PACKETVER == 20131223 || \
     PACKETVER == 20140508 || \
     PACKETVER == 20140611 || \
@@ -883,7 +883,9 @@
     PACKETVER == 20180321 || \
     PACKETVER == 20180328 || \
     PACKETVER == 20180404 || \
-    PACKETVER >= 20180418
+    PACKETVER == 20180418 || \
+    PACKETVER == 20180425 || \
+    PACKETVER >= 20180502
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_keys_zero.h b/src/map/packets_keys_zero.h
index d9625f716..8540ff5a5 100644
--- a/src/map/packets_keys_zero.h
+++ b/src/map/packets_keys_zero.h
@@ -29,7 +29,7 @@
 
 /* This file is autogenerated, please do not commit manual changes */
 
-// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero
+// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero
 #if PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
     PACKETVER == 20171024 || \
@@ -42,7 +42,8 @@
     PACKETVER == 20180315 || \
     PACKETVER == 20180321 || \
     PACKETVER == 20180328 || \
-    PACKETVER >= 20180411
+    PACKETVER == 20180411 || \
+    PACKETVER >= 20180425
 	packetKeys(0x00000000,0x00000000,0x00000000);
 #endif
 
diff --git a/src/map/packets_shuffle_main.h b/src/map/packets_shuffle_main.h
index 4bb998652..6ef63aae9 100644
--- a/src/map/packets_shuffle_main.h
+++ b/src/map/packets_shuffle_main.h
@@ -3345,14 +3345,16 @@
 	packet(0x0969,2,clif->pSearchStoreInfoNextPage,0);  // CZ_SEARCH_STORE_INFO_NEXT_PAGE
 #endif
 
-// 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE
+// 2014-06-11eRagexe, 2015-02-25hRagexe, 2018-03-15aRagexe, 2018-03-21aRagexe, 2018-03-21aRagexeRE, 2018-03-28bRagexe, 2018-03-28bRagexeRE, 2018-04-04bRagexe, 2018-04-04cRagexeRE, 2018-04-18aRagexe, 2018-04-18bRagexeRE, 2018-04-25cRagexe, 2018-04-25cRagexeRE, 2018-05-02bRagexe, 2018-05-02bRagexeRE
 #if PACKETVER == 20140611 || \
     PACKETVER == 20150225 || \
     PACKETVER == 20180315 || \
     PACKETVER == 20180321 || \
     PACKETVER == 20180328 || \
     PACKETVER == 20180404 || \
-    PACKETVER >= 20180418
+    PACKETVER == 20180418 || \
+    PACKETVER == 20180425 || \
+    PACKETVER >= 20180502
 	packet(0x0202,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
 	packet(0x022d,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
 	packet(0x023b,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD
diff --git a/src/map/packets_shuffle_zero.h b/src/map/packets_shuffle_zero.h
index 087eb119f..e7083e200 100644
--- a/src/map/packets_shuffle_zero.h
+++ b/src/map/packets_shuffle_zero.h
@@ -36,7 +36,7 @@
 /* This file is autogenerated, please do not commit manual changes */
 
 
-// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero
+// 2017-10-19aRagexe_zero, 2017-10-23aRagexe_zero, 2017-10-23bRagexe_zero, 2017-10-23cRagexe_zero, 2017-10-24aRagexe_2_zero, 2017-10-24aRagexe_zero, 2017-10-25bRagexe_zero, 2017-10-27aRagexe_zero, 2017-10-27bRagexe_zero, 2017-10-30aRagexe_zero, 2017-10-31aRagexe_zero, 2017-11-09aRagexe_zero, 2017-11-13aRagexe_zero, 2017-11-13bRagexe_zero, 2018-03-15aRagexe_zero, 2018-03-21aRagexe_zero, 2018-03-21bRagexe_zero, 2018-03-28_1aRagexe_zero, 2018-03-28cRagexe_zero, 2018-04-11aRagexe_zero, 2018-04-25_3aRagexe_zero
 #if PACKETVER == 20171019 || \
     PACKETVER == 20171023 || \
     PACKETVER == 20171024 || \
@@ -49,7 +49,8 @@
     PACKETVER == 20180315 || \
     PACKETVER == 20180321 || \
     PACKETVER == 20180328 || \
-    PACKETVER >= 20180411
+    PACKETVER == 20180411 || \
+    PACKETVER >= 20180425
 	packet(0x0202,26,clif->pFriendsListAdd,2);  // CZ_ADD_FRIENDS
 	packet(0x022d,5,clif->pHomMenu,2,4);  // CZ_COMMAND_MER
 	packet(0x023b,36,clif->pStoragePassword,0);  // CZ_ACK_STORE_PASSWORD