diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-04-26 05:32:55 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2019-05-05 22:24:25 +0300 |
| commit | e084ef46f343fed0f2b2d5e68e971012d01cfd09 (patch) | |
| tree | 314b2c94f1e8dff132d3e0c41ae4a01ca867cb08 /src/map/packets_struct.h | |
| parent | 52d19df34575f43de69db33ba64b9b4ffe7f72c2 (diff) | |
| download | hercules-e084ef46f343fed0f2b2d5e68e971012d01cfd09.tar.gz hercules-e084ef46f343fed0f2b2d5e68e971012d01cfd09.tar.bz2 hercules-e084ef46f343fed0f2b2d5e68e971012d01cfd09.tar.xz hercules-e084ef46f343fed0f2b2d5e68e971012d01cfd09.zip | |
Convert packet ZC_MERGE_ITEM_OPEN into struct and fix packet dates
Diffstat (limited to 'src/map/packets_struct.h')
| -rw-r--r-- | src/map/packets_struct.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 80f3462c6..a660de67b 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -3295,6 +3295,19 @@ struct PACKET_ZC_ACK_MERGE_ITEM { DEFINE_PACKET_HEADER(ZC_ACK_MERGE_ITEM, 0x096f); #endif +#if PACKETVER_MAIN_NUM >= 20120314 || PACKETVER_RE_NUM >= 20120221 || defined(PACKETVER_ZERO) +struct PACKET_ZC_MERGE_ITEM_OPEN_sub { + int16 index; +} __attribute__((packed)); + +struct PACKET_ZC_MERGE_ITEM_OPEN { + int16 packetType; + uint16 packetLen; + struct PACKET_ZC_MERGE_ITEM_OPEN_sub items[]; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_MERGE_ITEM_OPEN, 0x096d); +#endif + #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) #endif // not NetBSD < 6 / Solaris |