Merge pull request #2491 from 4144/updatepackets

Update packets up to 2019-06-05

1 files changed, 66 insertions, 58 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 4e8653783..7c9a68b2b 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -1649,7 +1649,9 @@ static void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int
 	p.level = hd->homunculus.level;
 	p.hunger = hd->homunculus.hunger;
 	p.intimacy = hd->homunculus.intimacy / 100;
+#if !(PACKETVER_MAIN_NUM >= 20190619 || PACKETVER_RE_NUM >= 20190605 || PACKETVER_ZERO_NUM >= 20190626)
 	p.itemId = 0; // equip id
+#endif
 #ifdef RENEWAL
 	p.atk2 = cap_value(hstatus->rhw.atk2, 0, INT16_MAX);
 #else
@@ -3909,20 +3911,16 @@ static void clif_arrow_fail(struct map_session_data *sd, int type)
 /// 01ad <packet len>.W { <name id>.W }*
 static void clif_arrow_create_list(struct map_session_data *sd)
 {
-	int i, c;
-	int fd;
-	int len;
-	struct PACKET_ZC_MAKINGARROW_LIST *p;
-
 	nullpo_retv(sd);
 
-	fd = sd->fd;
-	len = MAX_SKILL_ARROW_DB * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+	int fd = sd->fd;
+	int len = MAX_SKILL_ARROW_DB * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
 	WFIFOHEAD(fd, len);
-	p = WFIFOP(fd, 0);
-	p->packetType = 0x1ad;
+	struct PACKET_ZC_MAKINGARROW_LIST *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_MAKINGARROW_LIST;
 
-	for (i = 0, c = 0; i < MAX_SKILL_ARROW_DB; i++) {
+	int c = 0;
+	for (int i = 0; i < MAX_SKILL_ARROW_DB; i++) {
 		int j;
 		if (skill->dbs->arrow_db[i].nameid > 0
 		 && (j = pc->search_inventory(sd, skill->dbs->arrow_db[i].nameid)) != INDEX_NOT_FOUND
@@ -9482,7 +9480,8 @@ static void clif_mobname_normal_ack(int fd, struct block_list *bl)
 	struct PACKET_ZC_ACK_REQNAME_TITLE packet = { 0 };
 	packet.packet_id = HEADER_ZC_ACK_REQNAME_TITLE;
 	packet.gid = bl->id;
-	memcpy(packet.name, BL_UCCAST(BL_MOB, bl)->db->name, NAME_LENGTH);
+	const struct mob_data *md = BL_UCCAST(BL_MOB, bl);
+	memcpy(packet.name, md->name, NAME_LENGTH);
 #if PACKETVER_MAIN_NUM >= 20180207 || PACKETVER_RE_NUM >= 20171129 || PACKETVER_ZERO_NUM >= 20171130
 	struct unit_data *ud = unit->bl2ud(bl);
 	if (ud != NULL) {
@@ -10825,7 +10824,7 @@ static void clif_hotkeysAll_send(struct map_session_data *sd)
 {
 #ifdef HOTKEY_SAVING
 	clif->hotkeys(sd, 0);
-#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	// send second tab only if data exists
 	for (int i = MAX_HOTKEYS; i < MAX_HOTKEYS * 2; i++) {
 		if (sd->status.hotkeys[i].type != 0 || sd->status.hotkeys[i].id != 0 || sd->status.hotkeys[i].lv != 0) {
@@ -10854,7 +10853,7 @@ static void clif_hotkeys_send(struct map_session_data *sd, int tab)
 	else
 		p.rotate = sd->status.hotkey_rowshift2;
 #endif
-#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	p.tab = tab;
 #endif
 	const int offset = tab * MAX_HOTKEYS;
@@ -10879,7 +10878,7 @@ static void clif_parse_HotkeyRowShift1(int fd, struct map_session_data *sd)
 static void clif_parse_HotkeyRowShift2(int fd, struct map_session_data *sd) __attribute__((nonnull (2)));
 static void clif_parse_HotkeyRowShift2(int fd, struct map_session_data *sd)
 {
-#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	const struct PACKET_CZ_SHORTCUTKEYBAR_ROTATE2 *p = RFIFOP(fd, 0);
 	if (p->tab == 0)
 		sd->status.hotkey_rowshift = p->rowshift;
@@ -10911,7 +10910,7 @@ static void clif_parse_Hotkey2(int fd, struct map_session_data *sd) __attribute_
 static void clif_parse_Hotkey2(int fd, struct map_session_data *sd)
 {
 #ifdef HOTKEY_SAVING
-#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190605
 	const struct PACKET_CZ_SHORTCUT_KEY_CHANGE2 *p = RFIFOP(fd, 0);
 	const unsigned short idx = p->index + p->tab * MAX_HOTKEYS;
 	Assert_retv(idx < MAX_HOTKEYS_DB);
@@ -19029,27 +19028,30 @@ static void clif_parse_debug(int fd, struct map_session_data *sd)
  *------------------------------------------*/
 static int clif_elementalconverter_list(struct map_session_data *sd)
 {
-	int i,c,view,fd;
-
 	nullpo_ret(sd);
 
 /// Main client packet processing function
-	fd=sd->fd;
-	WFIFOHEAD(fd, MAX_SKILL_PRODUCE_DB *2+4);
-	WFIFOW(fd, 0)=0x1ad;
+	int fd = sd->fd;
+	int len = MAX_SKILL_ARROW_DB * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+	WFIFOHEAD(fd, len);
+	struct PACKET_ZC_MAKINGARROW_LIST *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_MAKINGARROW_LIST;
 
-	for(i=0,c=0;i<MAX_SKILL_PRODUCE_DB;i++){
-		if( skill->can_produce_mix(sd,skill->dbs->produce_db[i].nameid,23, 1) ){
-			if((view = itemdb_viewid(skill->dbs->produce_db[i].nameid)) > 0)
-				WFIFOW(fd,c*2+ 4)= view;
+	int c = 0;
+	for (int i = 0; i < MAX_SKILL_PRODUCE_DB; i++) {
+		if (skill->can_produce_mix(sd,skill->dbs->produce_db[i].nameid,23, 1) ) {
+			int view = itemdb_viewid(skill->dbs->produce_db[i].nameid);
+			if (view > 0)
+				p->items[c].itemId = view;
 			else
-				WFIFOW(fd,c*2+ 4)= skill->dbs->produce_db[i].nameid;
+				p->items[c].itemId = skill->dbs->produce_db[i].nameid;
 			c++;
 		}
 	}
-	WFIFOW(fd,2) = c*2+4;
-	WFIFOSET(fd, WFIFOW(fd,2));
 	if (c > 0) {
+		len = c * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+		p->packetLength = len;
+		WFIFOSET(fd, len);
 		sd->menuskill_id = SA_CREATECON;
 		sd->menuskill_val = c;
 	}
@@ -19080,33 +19082,33 @@ static void clif_millenniumshield(struct block_list *bl, short shields)
  *------------------------------------------*/
 static int clif_spellbook_list(struct map_session_data *sd)
 {
-	int i, c;
-	int fd;
-
 	nullpo_ret(sd);
 
-	fd = sd->fd;
-	WFIFOHEAD(fd, 8 * 8 + 8);
-	WFIFOW(fd,0) = 0x1ad;
+	int fd = sd->fd;
+	int len = MAX_SKILL_ARROW_DB * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+	WFIFOHEAD(fd, len);
+	struct PACKET_ZC_MAKINGARROW_LIST *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_MAKINGARROW_LIST;
 
-	for (i = 0, c = 0; i < sd->status.inventorySize; i ++ )
+	int c = 0;
+	for (int i = 0; i < sd->status.inventorySize; i ++ )
 	{
-		if( itemdb_is_spellbook(sd->status.inventory[i].nameid) )
+		if (itemdb_is_spellbook(sd->status.inventory[i].nameid))
 		{
-			WFIFOW(fd, c * 2 + 4) = sd->status.inventory[i].nameid;
+			p->items[c].itemId = sd->status.inventory[i].nameid;
 			c++;
 		}
 	}
 
-	if( c > 0 )
+	if (c > 0)
 	{
-		WFIFOW(fd,2) = c * 2 + 4;
-		WFIFOSET(fd, WFIFOW(fd, 2));
+		len = c * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+		p->packetLength = len;
+		WFIFOSET(fd, len);
 		sd->menuskill_id = WL_READING_SB;
 		sd->menuskill_val = c;
-	}
-	else{
-		status_change_end(&sd->bl,SC_STOP,INVALID_TIMER);
+	} else {
+		status_change_end(&sd->bl, SC_STOP, INVALID_TIMER);
 		clif->skill_fail(sd, WL_READING_SB, USESKILL_FAIL_SPELLBOOK, 0, 0);
 	}
 
@@ -19121,17 +19123,18 @@ static int clif_spellbook_list(struct map_session_data *sd)
 static int clif_magicdecoy_list(struct map_session_data *sd, uint16 skill_lv, short x, short y)
 {
 	int i, c;
-	int fd;
 
 	nullpo_ret(sd);
 
-	fd = sd->fd;
-	WFIFOHEAD(fd, 8 * 8 + 8);
-	WFIFOW(fd,0) = 0x1ad; // This is the official packet. [pakpil]
+	int fd = sd->fd;
+	int len = MAX_SKILL_ARROW_DB * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+	WFIFOHEAD(fd, len);
+	struct PACKET_ZC_MAKINGARROW_LIST *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_MAKINGARROW_LIST;
 
 	for (i = 0, c = 0; i < sd->status.inventorySize; i ++) {
-		if( itemdb_is_element(sd->status.inventory[i].nameid) ) {
-			WFIFOW(fd, c * 2 + 4) = sd->status.inventory[i].nameid;
+		if (itemdb_is_element(sd->status.inventory[i].nameid)) {
+			p->items[c].itemId = sd->status.inventory[i].nameid;
 			c ++;
 		}
 	}
@@ -19140,8 +19143,10 @@ static int clif_magicdecoy_list(struct map_session_data *sd, uint16 skill_lv, sh
 		sd->menuskill_val = skill_lv;
 		sd->sc.comet_x = x;
 		sd->sc.comet_y = y;
-		WFIFOW(fd,2) = c * 2 + 4;
-		WFIFOSET(fd, WFIFOW(fd, 2));
+
+		len = c * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+		p->packetLength = len;
+		WFIFOSET(fd, len);
 	} else {
 		clif->skill_fail(sd, NC_MAGICDECOY, USESKILL_FAIL_LEVEL, 0, 0);
 		return 0;
@@ -19158,25 +19163,28 @@ static int clif_magicdecoy_list(struct map_session_data *sd, uint16 skill_lv, sh
 static int clif_poison_list(struct map_session_data *sd, uint16 skill_lv)
 {
 	int i, c;
-	int fd;
 
 	nullpo_ret(sd);
 
-	fd = sd->fd;
-	WFIFOHEAD(fd, 8 * 8 + 8);
-	WFIFOW(fd,0) = 0x1ad; // This is the official packet. [pakpil]
+	int fd = sd->fd;
+	int len = MAX_SKILL_ARROW_DB * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+	WFIFOHEAD(fd, len);
+	struct PACKET_ZC_MAKINGARROW_LIST *p = WFIFOP(fd, 0);
+	p->packetType = HEADER_ZC_MAKINGARROW_LIST;
 
 	for (i = 0, c = 0; i < sd->status.inventorySize; i ++) {
 		if( itemdb_is_poison(sd->status.inventory[i].nameid) ) {
-			WFIFOW(fd, c * 2 + 4) = sd->status.inventory[i].nameid;
+			p->items[c].itemId = sd->status.inventory[i].nameid;
 			c ++;
 		}
 	}
-	if( c > 0 ) {
+	if (c > 0) {
 		sd->menuskill_id = GC_POISONINGWEAPON;
 		sd->menuskill_val = skill_lv;
-		WFIFOW(fd,2) = c * 2 + 4;
-		WFIFOSET(fd, WFIFOW(fd, 2));
+
+		len = c * sizeof(struct PACKET_ZC_MAKINGARROW_LIST_sub) + sizeof(struct PACKET_ZC_MAKINGARROW_LIST);
+		p->packetLength = len;
+		WFIFOSET(fd, len);
 	} else {
 		clif->skill_fail(sd, GC_POISONINGWEAPON, USESKILL_FAIL_GUILLONTINE_POISON, 0, 0);
 		return 0;