Merge pull request #2020 from Asheraf/packets

Enable some features for newer client versions

4 files changed, 10 insertions, 10 deletions

diff --git a/conf/map/battle/feature.conf b/conf/map/battle/feature.conf
index c0c60e475..8d19539b4 100644
--- a/conf/map/battle/feature.conf
+++ b/conf/map/battle/feature.conf
@@ -71,7 +71,7 @@ features: {
 	// false: disable
 	enable_homun_autofeed: true
 
-	// Enable Attendance System for clients >= 2018-03-07bRagexeRE or 2018-04-04bRagexe
+	// Enable Attendance System for clients >= 2018-03-07bRagexeRE or 2018-04-04bRagexe or 2018-04-11aRagexe_zero
 	// true:  enable (Default)
 	// false: disable
 	enable_attendance_system: true
diff --git a/doc/item_db.txt b/doc/item_db.txt
index 16eca2e23..4ada106c7 100644
--- a/doc/item_db.txt
+++ b/doc/item_db.txt
@@ -371,8 +371,8 @@ Inherit: This can be used only in item_db2.conf, and if set to true, and the
          item already exists in item_db.conf, all the missing fields will be
          inherited from there rather than using their default values.
 
-ShowDropEffect: Allow showing an effect when the item dropped by a monster. [ZERO client only]
-DropEffectMode: Set attribute for ShowDropEffect. [ZERO client only]
+ShowDropEffect: Allow showing an effect when the item dropped by a monster. [ZERO client or PACKETVER >= 20180418]
+DropEffectMode: Set attribute for ShowDropEffect. [ZERO client or PACKETVER >= 20180418]
 				0 - Client Based (itemInfo EffectID)
 				1 - White effect
 				2 - Blue effect
diff --git a/src/map/clif.c b/src/map/clif.c
index 60f4b18c0..47d5a1586 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -819,7 +819,7 @@ void clif_dropflooritem(struct flooritem_data* fitem) {
 	p.subX = fitem->subx;
 	p.subY = fitem->suby;
 	p.count = fitem->item_data.amount;
-#ifdef PACKETVER_ZERO
+#if defined(PACKETVER_ZERO) || PACKETVER >= 20180418
 	if (fitem->showdropeffect) {
 		p.showdropeffect = itemdb_showdropeffect(fitem->item_data.nameid);
 		p.dropeffectmode = itemdb_dropeffectmode(fitem->item_data.nameid);
@@ -20519,7 +20519,7 @@ void clif_parse_open_ui_request(int fd, struct map_session_data *sd)
 
 void clif_open_ui(struct map_session_data *sd, int8 UIType)
 {
-#if PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404
+#if PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404 || PACKETVER_ZERO_NUM >= 20180411
 	int claimed = 0;
 	struct PACKET_ZC_OPEN_UI p;
 
@@ -20542,14 +20542,14 @@ void clif_open_ui(struct map_session_data *sd, int8 UIType)
 
 	clif->send(&p, sizeof(p), &sd->bl, SELF);
 #else
-	ShowWarning("Attendance System available only for PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404.\n");
+	ShowWarning("Attendance System available only for PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404 || PACKETVER_ZERO_NUM >= 20180411.\n");
 #endif
 }
 
 void clif_parse_attendance_reward_request(int fd, struct map_session_data *sd) __attribute__((nonnull(2)));
 void clif_parse_attendance_reward_request(int fd, struct map_session_data *sd)
 {
-#if PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404
+#if PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404 || PACKETVER_ZERO_NUM >= 20180411
 
 	struct rodex_message msg = { 0 };
 	struct attendance_entry *entry;
@@ -20593,7 +20593,7 @@ void clif_parse_attendance_reward_request(int fd, struct map_session_data *sd)
 	intif->rodex_sendmail(&msg);
 	clif->ui_action(sd, 0, sd->status.attendance_count);
 #else
-	ShowWarning("Attendance System available only for PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404.\n");
+	ShowWarning("Attendance System available only for PACKETVER_RE_NUM >= 20180307 || PACKETVER_MAIN_NUM >= 20180404 || PACKETVER_ZERO_NUM >= 20180411.\n");
 #endif
 }
 
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index 438084778..5b9a4344a 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -191,7 +191,7 @@ enum packet_headers {
 	skill_entryType = 0x9ca,
 #endif
 	graffiti_entryType = 0x1c9,
-#ifdef PACKETVER_ZERO
+#if defined(PACKETVER_ZERO) || PACKETVER >= 20180418
 	dropflooritemType = 0xadd,
 #elif PACKETVER > 20130000 /* not sure date */
 	dropflooritemType = 0x84b,
@@ -530,7 +530,7 @@ struct packet_dropflooritem {
 	uint8 subX;
 	uint8 subY;
 	int16 count;
-#ifdef PACKETVER_ZERO
+#if defined(PACKETVER_ZERO) || PACKETVER >= 20180418
 	int8 showdropeffect;
 	int16 dropeffectmode;
 #endif