diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-07-20 22:40:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-07-28 04:41:41 +0300 |
| commit | 95e77d7d3cb31c7db1df2adb75436db2c37d8211 (patch) | |
| tree | 92cb249923dfb83c4b59909ddba6ebdc893284d1 | |
| parent | 953a195826376293a092dc00bd8400dd3c88e37a (diff) | |
| download | hercules-95e77d7d3cb31c7db1df2adb75436db2c37d8211.tar.gz hercules-95e77d7d3cb31c7db1df2adb75436db2c37d8211.tar.bz2 hercules-95e77d7d3cb31c7db1df2adb75436db2c37d8211.tar.xz hercules-95e77d7d3cb31c7db1df2adb75436db2c37d8211.zip | |
Fix check for packet 0xa43 and related packets.
| -rw-r--r-- | src/map/clif.c | 7 | ||||
| -rw-r--r-- | src/map/packets_struct.h | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 7a50032c1..2076a922b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -6771,7 +6771,7 @@ static void clif_party_member_info(struct party_data *p, struct map_session_data packet.GID = sd->status.char_id; #endif packet.leader = (p->party.member[i].leader) ? 0 : 1; -#if PACKETVER >= 20170502 +#if PACKETVER_MAIN_NUM >= 20170524 || PACKETVER_RE_NUM >= 20170502 || defined(PACKETVER_ZERO) packet.class = sd->status.class; packet.baseLevel = sd->status.base_level; #endif @@ -6822,7 +6822,7 @@ static void clif_party_info(struct party_data *p, struct map_session_data *sd) mapindex->getmapname_ext(mapindex_id2name(m->map), packet->members[c].mapName); packet->members[c].leader = (m->leader) ? 0 : 1; packet->members[c].offline = (m->online) ? 0 : 1; -#if PACKETVER >= 20170502 +#if PACKETVER_MAIN_NUM >= 20170524 || PACKETVER_RE_NUM >= 20170502 || defined(PACKETVER_ZERO) packet->members[c].class = m->class; packet->members[c].baseLevel = m->lv; #endif @@ -6841,8 +6841,7 @@ static void clif_party_info(struct party_data *p, struct map_session_data *sd) /// 0abd <account id>.L <job>.W <level>.W static void clif_party_job_and_level(struct map_session_data *sd) { -// [4144] packet 0xabd added in client in 2017-02-15 because this probably it can works for clients older than 20170502 -#if PACKETVER >= 20170502 +#if PACKETVER_MAIN_NUM >= 20170502 || PACKETVER_RE_NUM >= 20170419 || defined(PACKETVER_ZERO) unsigned char buf[10]; nullpo_retv(sd); diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index b83463c11..08f8d7881 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -346,8 +346,7 @@ enum packet_headers { #if PACKETVER >= 20171207 partymemberinfo = 0x0ae4, partyinfo = 0x0ae5, -#elif PACKETVER >= 20170502 -// [4144] probably 0xa43 packet can works on older clients because in client was added in 2015-10-07 +#elif PACKETVER_MAIN_NUM >= 20170524 || PACKETVER_RE_NUM >= 20170502 || defined(PACKETVER_ZERO) partymemberinfo = 0x0a43, partyinfo = 0x0a44, #else @@ -1680,8 +1679,7 @@ struct PACKET_ZC_ADD_MEMBER_TO_GROUP { uint32 GID; #endif uint32 leader; -// [4144] probably 0xa43 packet can works on older clients because in client was added in 2015-10-07 -#if PACKETVER >= 20170502 +#if PACKETVER_MAIN_NUM >= 20170524 || PACKETVER_RE_NUM >= 20170502 || defined(PACKETVER_ZERO) int16 class; int16 baseLevel; #endif @@ -1704,7 +1702,7 @@ struct PACKET_ZC_GROUP_LIST_SUB { char mapName[MAP_NAME_LENGTH_EXT]; uint8 leader; uint8 offline; -#if PACKETVER >= 20170502 +#if PACKETVER_MAIN_NUM >= 20170524 || PACKETVER_RE_NUM >= 20170502 || defined(PACKETVER_ZERO) int16 class; int16 baseLevel; #endif |