diff options
| author | Haru <haru@dotalux.com> | 2018-11-13 15:50:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 15:50:27 +0100 |
| commit | 78e45afe1345185e657b9064df24fdf0592c97b4 (patch) | |
| tree | 8d5108d7ae8af13a77d871d748614a21a58bda59 /src/map/packets_struct.h | |
| parent | e606053634bd3dcfad567ed0065c2d3062c4222b (diff) | |
| parent | 3b8ebb26d93c4ebaec6f66014b43b288036f7357 (diff) | |
| download | hercules-78e45afe1345185e657b9064df24fdf0592c97b4.tar.gz hercules-78e45afe1345185e657b9064df24fdf0592c97b4.tar.bz2 hercules-78e45afe1345185e657b9064df24fdf0592c97b4.tar.xz hercules-78e45afe1345185e657b9064df24fdf0592c97b4.zip | |
Merge pull request #2310 from 4144/updatepackets
Update packets and messages up to 2018-11-07
Diffstat (limited to 'src/map/packets_struct.h')
| -rw-r--r-- | src/map/packets_struct.h | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index c786e2457..374769728 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -451,11 +451,16 @@ enum packet_headers { #else guildLeave = 0x15a, #endif -#if PACKETVER_MAIN_NUM >= 20181017 || PACKETVER_RE_NUM >= 20181017 +#if PACKETVER_MAIN_NUM >= 20181017 || PACKETVER_RE_NUM >= 20181017 || PACKETVER_ZERO_NUM >= 20181024 itemPreview = 0xb13, #else itemPreview = 0xab9, #endif +#if PACKETVER_RE_NUM >= 20181031 + autoSpellList = 0xafb, +#else + autoSpellList = 0x1cd, +#endif }; #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute @@ -1928,7 +1933,9 @@ struct PACKET_ZC_FORMATSTRING_MSG_COLOR { uint16 PacketType; uint16 PacketLength; uint16 messageId; +#if PACKETVER >= 20160406 uint32 color; +#endif char messageString[]; } __attribute__((packed)); @@ -2880,7 +2887,7 @@ struct PACKET_ZC_CAMERA_INFO { struct PACKET_ZC_ITEM_PREVIEW { int16 packetType; int16 index; -#if PACKETVER_MAIN_NUM >= 20181017 || PACKETVER_RE_NUM >= 20181017 +#if PACKETVER_MAIN_NUM >= 20181017 || PACKETVER_RE_NUM >= 20181017 || PACKETVER_ZERO_NUM >= 20181024 int8 isDamaged; #endif int16 refiningLevel; @@ -2888,6 +2895,22 @@ struct PACKET_ZC_ITEM_PREVIEW { struct ItemOptions option_data[MAX_ITEM_OPTIONS]; } __attribute__((packed)); +#if PACKETVER_RE_NUM >= 20181031 +#define PACKET_ZC_AUTOSPELLLIST PACKET_ZC_AUTOSPELLLIST2 +#else +#define PACKET_ZC_AUTOSPELLLIST PACKET_ZC_AUTOSPELLLIST1 +#endif + +struct PACKET_ZC_AUTOSPELLLIST1 { + int16 packetType; + int skills[7]; +} __attribute__((packed)); + +struct PACKET_ZC_AUTOSPELLLIST2 { + int16 packetType; + int16 packetLength; + int skills[]; +} __attribute__((packed)); #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) |