From 84675f75d60f807ebbe932d7c591c8b1d59cfaf1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 2 Nov 2016 04:41:22 +0300
Subject: Fix version for packet 0x0a28 ZC_ACK_OPENSTORE2

---
 src/map/clif.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 424d94205..beec3c008 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -6418,12 +6418,12 @@ void clif_openvending(struct map_session_data* sd, int id, struct s_vending* ven
 	}
 	WFIFOSET(fd,WFIFOW(fd,2));
 
-#if PACKETVER >= 20141022
+#if PACKETVER >= 20140625
 	/** should go elsewhere perhaps? it has to be bundled with this however. **/
-	WFIFOHEAD(fd, 3);
+	WFIFOHEAD(fd, packet_len(0xa28));
 	WFIFOW(fd, 0) = 0xa28;
 	WFIFOB(fd, 2) = 0;/** 1 is failure. our current responses to failure are working so not yet implemented **/
-	WFIFOSET(fd, 3);
+	WFIFOSET(fd, packet_len(0xa28));
 #endif
 }
 
-- 
cgit v1.2.3-70-g09d2


From 5014f675f4d49ea4ddcb388c79f8e32c9e291988 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 2 Nov 2016 04:46:48 +0300
Subject: Add packet size 0x097d ZC_ACK_RANKING into packets.h

---
 src/map/clif.c    | 5 +++--
 src/map/packets.h | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index beec3c008..1c0e7ea37 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -14222,11 +14222,12 @@ void clif_ranklist(struct map_session_data *sd, enum fame_list_type type)
 	int fd;
 	int mypoint = 0;
 	int upperMask;
+	int len = packet_len(0x97d);
 
 	nullpo_retv(sd);
 	fd = sd->fd;
 	upperMask = sd->class_&MAPID_UPPERMASK;
-	WFIFOHEAD(fd, 288);
+	WFIFOHEAD(fd, len);
 	WFIFOW(fd, 0) = 0x97d;
 	WFIFOW(fd, 2) = type;
 	clif_ranklist_sub(WFIFOP(fd,4), type);
@@ -14241,7 +14242,7 @@ void clif_ranklist(struct map_session_data *sd, enum fame_list_type type)
 	}
 
 	WFIFOL(fd, 284) = mypoint; //mypoint
-	WFIFOSET(fd, 288);
+	WFIFOSET(fd, len);
 #endif
 }
 
diff --git a/src/map/packets.h b/src/map/packets.h
index ef4acae95..4d59d42c1 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2046,14 +2046,22 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x0916,26,clif->pGuildInvite2,2);
 #endif
 
+// 2012-05-02aRagexeRE
+#if PACKETVER >= 20120502
+// shuffle packets not added
+	packet(0x097d,288); // ZC_ACK_RANKING
+#endif
+
 #ifndef PACKETVER_RE
 #if PACKETVER >= 20120604
+// shuffle packets not added
 	packet(0x0861,18,clif->pPartyRecruitRegisterReq,2,4,6);
 #endif
 #endif
 
 //2012-06-18aRagexeRE
 #if PACKETVER >= 20120618
+// shuffle packets not added
 	packet(0x0983,29);
 #endif
 
-- 
cgit v1.2.3-70-g09d2


From 662b9832d227e6d1e795de55512457fb02842243 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 2 Nov 2016 04:54:59 +0300
Subject: Fix version for packet 0x097e ZC_UPDATE_RANKING_POINT.

---
 src/map/clif.c    | 10 ++++++----
 src/map/packets.h |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 1c0e7ea37..e18bbbf95 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -14263,8 +14263,9 @@ void clif_parse_ranklist(int fd, struct map_session_data *sd) {
 }
 
 // 097e <RankingType>.W <point>.L <TotalPoint>.L (ZC_UPDATE_RANKING_POINT)
-void clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_type type, int points) {
-#if PACKETVER < 20130710
+void clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_type type, int points)
+{
+#if PACKETVER < 20120502
 	switch( type ) {
 		case RANKTYPE_BLACKSMITH: clif->fame_blacksmith(sd,points); break;
 		case RANKTYPE_ALCHEMIST:  clif->fame_alchemist(sd,points);  break;
@@ -14273,15 +14274,16 @@ void clif_update_rankingpoint(struct map_session_data *sd, enum fame_list_type t
 #else
 
 	int fd;
+	int len = packet_len(0x97e);
 
 	nullpo_retv(sd);
 	fd = sd->fd;
-	WFIFOHEAD(fd, 12);
+	WFIFOHEAD(fd, len);
 	WFIFOW(fd, 0) = 0x97e;
 	WFIFOW(fd, 2) = type;
 	WFIFOL(fd, 4) = points;
 	WFIFOL(fd, 8) = sd->status.fame;
-	WFIFOSET(fd, 12);
+	WFIFOSET(fd, len);
 #endif
 }
 
diff --git a/src/map/packets.h b/src/map/packets.h
index 4d59d42c1..909c26a35 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -2050,6 +2050,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 #if PACKETVER >= 20120502
 // shuffle packets not added
 	packet(0x097d,288); // ZC_ACK_RANKING
+	packet(0x097e,12); // ZC_UPDATE_RANKING_POINT
 #endif
 
 #ifndef PACKETVER_RE
-- 
cgit v1.2.3-70-g09d2


From b35d946086480f22b82a317623aca84f03dc8ac6 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 2 Nov 2016 16:01:21 +0300
Subject: Fix version for packet 0x08e2 ZC_NAVIGATION_ACTIVE.

---
 src/map/clif.c    | 7 ++++---
 src/map/packets.h | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index e18bbbf95..031959be2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -18956,13 +18956,14 @@ void clif_selectcart(struct map_session_data *sd)
 /// Starts navigation to the given target on client side
 void clif_navigate_to(struct map_session_data *sd, const char* mapname, uint16 x, uint16 y, uint8 flag, bool hideWindow, uint16 mob_id)
 {
-#if PACKETVER >= 20111010
+// probably this packet with other fields present in older packet versions
+#if PACKETVER >= 20120307
 	int fd;
 
 	nullpo_retv(sd);
 	nullpo_retv(mapname);
 	fd = sd->fd;
-	WFIFOHEAD(fd, 27);
+	WFIFOHEAD(fd, packet_len(0x8e2));
 	WFIFOW(fd, 0) = 0x8e2;
 
 	// How detailed will our navigation be?
@@ -18990,7 +18991,7 @@ void clif_navigate_to(struct map_session_data *sd, const char* mapname, uint16 x
 	WFIFOW(fd, 23) = y;
 	// Target monster ID
 	WFIFOW(fd, 25) = mob_id;
-	WFIFOSET(fd, 27);
+	WFIFOSET(fd, packet_len(0x8e2));
 #endif
 }
 
diff --git a/src/map/packets.h b/src/map/packets.h
index 909c26a35..af1f82ca1 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1954,6 +1954,8 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x0835,2,clif->pSearchStoreInfoNextPage,0);
 	packet(0x0838,12,clif->pSearchStoreInfoListItemClick,2,6,10);
 	packet(0x0439,8,clif->pUseItem,2,4);
+// changed packet sizes
+	packet(0x08e2,27); // ZC_NAVIGATION_ACTIVE
 #endif
 
 //2012-04-10aRagexeRE
-- 
cgit v1.2.3-70-g09d2


From 365fb8f3accedaf1935b82fa1018d6df0161f683 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Nov 2016 03:35:17 +0300
Subject: Fix version for packet 0x08b3 ZC_SHOWSCRIPT

---
 src/map/clif.c    | 2 ++
 src/map/packets.h | 7 +++++++
 2 files changed, 9 insertions(+)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 031959be2..db9224329 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17865,6 +17865,7 @@ void clif_partytickack(struct map_session_data* sd, bool flag) {
 
 void clif_ShowScript(struct block_list *bl, const char *message)
 {
+#if PACKETVER >= 20110111
 	char buf[256];
 	int len;
 	nullpo_retv(bl);
@@ -17884,6 +17885,7 @@ void clif_ShowScript(struct block_list *bl, const char *message)
 	WBUFL(buf,4) = bl->id;
 	safestrncpy(WBUFP(buf,8),message,len);
 	clif->send(buf,WBUFW(buf,2),bl,AREA);
+#endif
 }
 
 void clif_status_change_end(struct block_list *bl, int tid, enum send_target target, int type) {
diff --git a/src/map/packets.h b/src/map/packets.h
index 27ad5c7a4..31ff03a16 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1875,6 +1875,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x08b1,-1); // ZC_MCSTORE_NOTMOVEITEM_LIST
 #endif
 
+// 2011-01-11aRagexe
+#if PACKETVER >= 20110111
+// shuffle packets not added
+// new packets
+	packet(0x08b3,-1); // ZC_SHOWSCRIPT
+#endif
+
 //2011-07-18aRagexe (Thanks to Yommy!)
 #if PACKETVER >= 20110718
 	packet(0x0844,2,clif->pCashShopOpen,2);/* tell server cashshop window is being open */
-- 
cgit v1.2.3-70-g09d2


From dc45270e96f73ac8cf45d62f9160fb02fecaf573 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Nov 2016 04:07:58 +0300
Subject: Fix version for packet 0x08c0 ZC_ACK_SE_CASH_ITEM_LIST2.

---
 src/map/clif.c    | 9 +++++++--
 src/map/packets.h | 7 +++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index db9224329..557d6216c 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17791,7 +17791,9 @@ void clif_parse_CashShopBuy(int fd, struct map_session_data *sd) {
 
 void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 /* [Ind/Hercules] */
-void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd) {
+void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd)
+{
+#if PACKETVER >= 20110222
 	short tab = RFIFOW(fd, 2);
 	int j;
 
@@ -17810,9 +17812,12 @@ void clif_parse_CashShopReqTab(int fd, struct map_session_data *sd) {
 	}
 
 	WFIFOSET(fd, 10 + ( clif->cs.item_count[tab] * 6 ));
+#endif
 }
+
 /* [Ind/Hercules] */
-void clif_maptypeproperty2(struct block_list *bl,enum send_target t) {
+void clif_maptypeproperty2(struct block_list *bl,enum send_target t)
+{
 #if PACKETVER >= 20121010
 	struct packet_maptypeproperty2 p;
 	struct map_session_data *sd = NULL;
diff --git a/src/map/packets.h b/src/map/packets.h
index 2b2b2a820..47ec9e29c 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1901,6 +1901,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x02f6,7,clif->pDull,2); // CZ_IRMAIL_LIST
 #endif
 
+// 2011-02-22aRagexe
+#if PACKETVER >= 20110222
+// shuffle packets not added
+// new packets
+	packet(0x08c0,-1); // ZC_ACK_SE_CASH_ITEM_LIST2
+#endif
+
 //2011-07-18aRagexe (Thanks to Yommy!)
 #if PACKETVER >= 20110718
 	packet(0x0844,2,clif->pCashShopOpen,2);/* tell server cashshop window is being open */
-- 
cgit v1.2.3-70-g09d2


From 645c97d3a754e9ca5b93cc7f32f00f62a21588c4 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Nov 2016 04:36:31 +0300
Subject: Fix version for packet 0x08ca ZC_ACK_SCHEDULER_CASHITEM.

---
 src/map/clif.c    | 5 ++++-
 src/map/packets.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 557d6216c..4d526a538 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17678,7 +17678,9 @@ void clif_parse_CashShopClose(int fd, struct map_session_data *sd) {
 }
 
 void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
-void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd) {
+void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd)
+{
+#if PACKETVER >= 20110614
 	int i, j = 0;
 
 	for( i = 0; i < CASHSHOP_TAB_MAX; i++ ) {
@@ -17698,6 +17700,7 @@ void clif_parse_CashShopSchedule(int fd, struct map_session_data *sd) {
 
 		WFIFOSET(fd, 8 + ( clif->cs.item_count[i] * 6 ));
 	}
+#endif
 }
 
 void clif_parse_CashShopBuy(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
diff --git a/src/map/packets.h b/src/map/packets.h
index e03141fcd..5f9dc0631 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1923,6 +1923,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 // new packets
 	packet(0x08c8,34); // ZC_NOTIFY_ACT3
 	packet(0x08c9,2,clif->pCashShopSchedule,0);
+	packet(0x08ca,-1); // ZC_ACK_SCHEDULER_CASHITEM
 #endif
 
 //2011-07-18aRagexe (Thanks to Yommy!)
-- 
cgit v1.2.3-70-g09d2


From cb030a9fe3e78df4215836c2a2c4e7f9ee75b88e Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Nov 2016 04:50:30 +0300
Subject: Fix version for packet 0x08cf ZC_SPIRITS_ATTRIBUTE.

---
 src/map/clif.c    | 4 ++--
 src/map/packets.h | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 4d526a538..bc01b5c5a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1360,7 +1360,7 @@ void clif_spiritball_single(int fd, struct map_session_data *sd) {
  *------------------------------------------*/
 void clif_charm_single(int fd, struct map_session_data *sd)
 {
-#if PACKETVER >= 20120410
+#if PACKETVER >= 20110809
 	nullpo_retv(sd);
 	WFIFOHEAD(fd, packet_len(0x08cf));
 	WFIFOW(fd,0) = 0x08cf;
@@ -17497,7 +17497,7 @@ void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) {
  *------------------------------------------*/
 void clif_charm(struct map_session_data *sd)
 {
-#if PACKETVER >= 20120410
+#if PACKETVER >= 20110809
 	unsigned char buf[10];
 
 	nullpo_retv(sd);
diff --git a/src/map/packets.h b/src/map/packets.h
index 51400a4bf..57baa457e 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1949,6 +1949,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x09dc,2); // unknown
 #endif
 
+// 2011-08-09aRagexe
+#if PACKETVER >= 20110809
+// shuffle packets not added
+// new packets
+	packet(0x08cf,10); // ZC_SPIRITS_ATTRIBUTE
+#endif
+
 //2011-10-05aRagexeRE
 #if PACKETVER >= 20111005
 	packet(0x0364,5,clif->pWalkToXY,2);
@@ -2095,7 +2102,6 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x08FB,6,clif->pDull,2); //bookingcanceljoinparty
 	packet(0x0907,5,clif->pMoveItem,2,4);
 	packet(0x0908,5);
-	packet(0x08CF,10);//Amulet spirits
 	packet(0x0977,14);//Monster HP Bar
 #endif
 
-- 
cgit v1.2.3-70-g09d2


From a2dd1c9d4ed8789018a9d139a804d0a858d837a1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Nov 2016 16:57:20 +0300
Subject: Fix version for packet 0x08d2 ZC_FASTMOVE.

---
 src/map/clif.c    | 2 +-
 src/map/packets.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index bc01b5c5a..7a7dae337 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17623,7 +17623,7 @@ void clif_favorite_item(struct map_session_data* sd, unsigned short index) {
 }
 
 void clif_snap( struct block_list *bl, short x, short y ) {
-#if PACKETVER >= 20111005
+#if PACKETVER >= 20110809
 	unsigned char buf[10];
 
 	nullpo_retv(bl);
diff --git a/src/map/packets.h b/src/map/packets.h
index 411f2736a..854c7a17f 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1956,6 +1956,7 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x08cf,10); // ZC_SPIRITS_ATTRIBUTE
 	packet(0x08d0,9); // ZC_REQ_WEAR_EQUIP_ACK2
 	packet(0x08d1,7); // ZC_REQ_TAKEOFF_EQUIP_ACK2
+	packet(0x08d2,10); // ZC_FASTMOVE
 #endif
 
 //2011-10-05aRagexeRE
@@ -1972,7 +1973,6 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x088a,6,clif->pGetCharNameRequest,2);
 	packet(0x0838,6,clif->pSolveCharName,2);
 	packet(0x0439,8,clif->pUseItem,2,4);
-	packet(0x08d2,10);
 	packet(0x08d7,28,clif->pBGQueueRegister,2);
 	packet(0x090a,26,clif->pBGQueueCheckState,2);
 	packet(0x08da,26,clif->pBGQueueRevokeReq,2);
@@ -2124,7 +2124,6 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x096A,6,clif->pGetCharNameRequest,2);
 	packet(0x0368,6,clif->pSolveCharName,2);
 	packet(0x08E5,41,clif->pPartyRecruitRegisterReq,2,4);
-	packet(0x08d2,10);
 	packet(0x0916,26,clif->pGuildInvite2,2);
 #endif
 
-- 
cgit v1.2.3-70-g09d2


From 9fd868cd971e9bd2e811c0037b6545833da5f954 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 3 Nov 2016 17:03:13 +0300
Subject: Fix version for packet 0x08d6 ZC_CLEAR_DIALOG.

---
 src/map/clif.c    | 7 +++++--
 src/map/packets.h | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 7a7dae337..5d9802b57 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -18050,14 +18050,17 @@ void clif_bgqueue_battlebegins(struct map_session_data *sd, unsigned char arena_
 	clif->send(&p,sizeof(p), &sd->bl, target);
 }
 
-void clif_scriptclear(struct map_session_data *sd, int npcid) {
+void clif_scriptclear(struct map_session_data *sd, int npcid)
+{
+#if PACKETVER >= 20110928
 	struct packet_script_clear p;
 
 	nullpo_retv(sd);
 	p.PacketType = script_clearType;
 	p.NpcID = npcid;
 
-	clif->send(&p,sizeof(p), &sd->bl, SELF);
+	clif->send(&p, sizeof(p), &sd->bl, SELF);
+#endif
 }
 
 /* Made Possible Thanks to Yommy! */
diff --git a/src/map/packets.h b/src/map/packets.h
index a800ba769..c622cb89d 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -1966,6 +1966,13 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x08d3,10); // ZC_SE_CASHSHOP_UPDATE
 #endif
 
+// 2011-09-28aRagexe
+#if PACKETVER >= 20110928
+// shuffle packets not added
+// new packets
+	packet(0x08d6,6); // ZC_CLEAR_DIALOG
+#endif
+
 //2011-10-05aRagexeRE
 #if PACKETVER >= 20111005
 	packet(0x0364,5,clif->pWalkToXY,2);
-- 
cgit v1.2.3-70-g09d2