diff options
| author | Haru <haru@dotalux.com> | 2019-10-18 15:08:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 15:08:03 +0200 |
| commit | 9ccfb2defb07670b4f350ed5853ae1a997d917d2 (patch) | |
| tree | f0a93da2ac6b5d2fa06e4db8d78f0e950fbf24d0 /src/map/packets_struct.h | |
| parent | 1e72ad082e6e10b0a4fbbe703ce6ad44efb4063d (diff) | |
| parent | 9e82150f9c3cbe2f83843a6d5fffaf3d91a7b119 (diff) | |
| download | hercules-9ccfb2defb07670b4f350ed5853ae1a997d917d2.tar.gz hercules-9ccfb2defb07670b4f350ed5853ae1a997d917d2.tar.bz2 hercules-9ccfb2defb07670b4f350ed5853ae1a997d917d2.tar.xz hercules-9ccfb2defb07670b4f350ed5853ae1a997d917d2.zip | |
Merge pull request #2537 from 4144/updatepackets
Update packets up to 2019-10-02
Diffstat (limited to 'src/map/packets_struct.h')
| -rw-r--r-- | src/map/packets_struct.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 9c8c93865..c0d1054d7 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -1183,7 +1183,8 @@ struct ZC_STORE_ITEMLIST_NORMAL { struct NORMALITEM_INFO list[MAX_ITEMLIST]; } __attribute__((packed)); -struct ZC_INVENTORY_START { +#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002 +struct PACKET_ZC_INVENTORY_START { int16 packetType; #if PACKETVER_RE_NUM >= 20180919 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002 int16 packetLength; @@ -1197,14 +1198,19 @@ struct ZC_INVENTORY_START { char name[NAME_LENGTH]; #endif } __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_INVENTORY_START, 0x0b08); +#endif // PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002 -struct ZC_INVENTORY_END { +#if PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002 +struct PACKET_ZC_INVENTORY_END { int16 packetType; #if PACKETVER_RE_NUM >= 20180912 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002 uint8 invType; #endif char flag; } __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_INVENTORY_END, 0x0b0b); +#endif // PACKETVER_RE_NUM >= 20180829 || PACKETVER_ZERO_NUM >= 20180919 || PACKETVER_MAIN_NUM >= 20181002 struct ZC_STORE_ITEMLIST_EQUIP { int16 PacketType; @@ -3523,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; @@ -3549,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); @@ -3560,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; |