summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-10-09 07:19:16 +0300
committerAndrei Karas <akaras@inbox.ru>2019-10-17 03:30:40 +0300
commit9e82150f9c3cbe2f83843a6d5fffaf3d91a7b119 (patch)
treee85df8367fca60717fdaa70c6fadd885cc980aa5
parentb4892d59f1b0dc91985eed6fd340457f9cbdf1cf (diff)
downloadhercules-9e82150f9c3cbe2f83843a6d5fffaf3d91a7b119.tar.gz
hercules-9e82150f9c3cbe2f83843a6d5fffaf3d91a7b119.tar.bz2
hercules-9e82150f9c3cbe2f83843a6d5fffaf3d91a7b119.tar.xz
hercules-9e82150f9c3cbe2f83843a6d5fffaf3d91a7b119.zip
Add support for new skill packets in zero 20190918 and newer
-rw-r--r--src/map/clif.c4
-rw-r--r--src/map/packets_struct.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 999a232dc..b2f2825d2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -5268,7 +5268,7 @@ static void clif_playerSkillToPacket(struct map_session_data *sd, struct SKILLDA
skillData->sp = 0;
skillData->range2 = 0;
}
-#if PACKETVER_RE_NUM >= 20190807
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
if (newSkill)
skillData->level2 = 0;
else
@@ -5419,7 +5419,7 @@ static void clif_skillinfo(struct map_session_data *sd, int skill_id, int inf)
p->sp = 0;
p->range2 = 0;
}
-#if PACKETVER_RE_NUM >= 20190807
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
p->level2 = skill_lv;
#endif
if (sd->status.skill[idx].flag == SKILL_FLAG_PERMANENT)
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h
index f64fff199..c0d1054d7 100644
--- a/src/map/packets_struct.h
+++ b/src/map/packets_struct.h
@@ -3529,7 +3529,7 @@ DEFINE_PACKET_HEADER(ZC_HAT_EFFECT, 0x0a3b);
#endif
// [4144] this struct updated not in all packets in client
-#if PACKETVER_RE_NUM >= 20190807
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
struct SKILLDATA {
uint16 id;
int inf;
@@ -3555,7 +3555,7 @@ struct PACKET_ZC_ADD_SKILL {
int16 packetType;
struct SKILLDATA skill;
} __attribute__((packed));
-#if PACKETVER_RE_NUM >= 20190807
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0b31);
#else
DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0111);
@@ -3566,13 +3566,13 @@ struct PACKET_ZC_SKILLINFO_LIST {
int16 packetLength;
struct SKILLDATA skills[];
} __attribute__((packed));
-#if PACKETVER_RE_NUM >= 20190807
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x0b32);
#else
DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x010f);
#endif
-#if PACKETVER_RE_NUM >= 20190807
+#if PACKETVER_RE_NUM >= 20190807 || PACKETVER_ZERO_NUM >= 20190918
struct PACKET_ZC_SKILLINFO_UPDATE2 {
int16 packetType;
uint16 id;