Skip to content

Commit 736a673

Browse files
committed
Add missing zero packetver for AUTOSPELL_LIST2 packet
1 parent 4a1308f commit 736a673

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/map/clif.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8026,7 +8026,7 @@ static void clif_autospell(struct map_session_data *sd, uint16 skill_lv, int *sk
80268026
#if PACKETVER_MAIN_NUM >= 20090406 || defined(PACKETVER_RE) || defined(PACKETVER_ZERO) || PACKETVER_SAK_NUM >= 20080618
80278027
nullpo_retv(sd);
80288028

8029-
#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
8029+
#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20180523
80308030
const int len = sizeof(struct PACKET_ZC_AUTOSPELLLIST) + sizeof(int) * list_len;
80318031
#else
80328032
const int len = sizeof(struct PACKET_ZC_AUTOSPELLLIST);
@@ -8043,7 +8043,7 @@ static void clif_autospell(struct map_session_data *sd, uint16 skill_lv, int *sk
80438043
memset(p, 0, sizeof(struct PACKET_ZC_AUTOSPELLLIST));
80448044

80458045
p->packetType = HEADER_ZC_AUTOSPELLLIST;
8046-
#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
8046+
#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20180523
80478047
p->packetLength = len;
80488048
#endif
80498049
memcpy(p->skills, skill_ids_list, sizeof(int) * list_len);

src/map/packets_struct.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3722,7 +3722,7 @@ struct PACKET_CZ_VIEW_CAMERAINFO {
37223722
DEFINE_PACKET_HEADER(CZ_VIEW_CAMERAINFO, 0x0a77);
37233723
#endif
37243724

3725-
#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031
3725+
#if PACKETVER_MAIN_NUM >= 20181128 || PACKETVER_RE_NUM >= 20181031 || PACKETVER_ZERO_NUM >= 20180523
37263726
// PACKET_ZC_AUTOSPELLLIST2
37273727
struct PACKET_ZC_AUTOSPELLLIST {
37283728
int16 packetType;

src/map/skill.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25123,7 +25123,7 @@ static bool skill_read_autospell_db(const char *filename)
2512325123
count++;
2512425124
}
2512525125

25126-
#if PACKETVER_MAIN_NUM < 20181128 && PACKETVER_RE_NUM < 20181031
25126+
#if PACKETVER_MAIN_NUM < 20181128 && PACKETVER_RE_NUM < 20181031 && PACKETVER_ZERO_NUM < 20180523
2512725127
if (count > 7) {
2512825128
ShowWarning("%s: Your current packet version only supports up to 7 autospell skills, but your autospell db contains \"%d\" skills. Some skills may not be shown.\n", __func__, count);
2512925129
ShowWarning("%s: Update your packet version or reduce the number of skills to fix this warning.\n", __func__);

0 commit comments

Comments
 (0)