diff options
author | Andrei Karas <akaras@inbox.ru> | 2019-08-09 00:47:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2019-08-21 22:36:41 +0300 |
commit | af9ee21c486c3099f4811e63f8c6d91d509a1034 (patch) | |
tree | 9bce77e6e0cd39d7da1eb31c48fffc4a3f31ad52 /src/map/packets_struct.h | |
parent | 759cc6382a4d96afe9ff47b3fa13f047e22ea922 (diff) | |
download | hercules-af9ee21c486c3099f4811e63f8c6d91d509a1034.tar.gz hercules-af9ee21c486c3099f4811e63f8c6d91d509a1034.tar.bz2 hercules-af9ee21c486c3099f4811e63f8c6d91d509a1034.tar.xz hercules-af9ee21c486c3099f4811e63f8c6d91d509a1034.zip |
Convert ZC_SKILLINFO_UPDATE2 into struct. Add new packet versions
Diffstat (limited to 'src/map/packets_struct.h')
-rw-r--r-- | src/map/packets_struct.h | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 233c6d9c2..b40064abf 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -3556,17 +3556,13 @@ struct SKILLDATA { } __attribute__((packed)); #endif -#if PACKETVER_RE_NUM >= 20190807 struct PACKET_ZC_ADD_SKILL { int16 packetType; struct SKILLDATA skill; } __attribute__((packed)); +#if PACKETVER_RE_NUM >= 20190807 DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0b31); #else -struct PACKET_ZC_ADD_SKILL { - int16 packetType; - struct SKILLDATA skill; -} __attribute__((packed)); DEFINE_PACKET_HEADER(ZC_ADD_SKILL, 0x0111); #endif @@ -3581,6 +3577,31 @@ DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x0b32); DEFINE_PACKET_HEADER(ZC_SKILLINFO_LIST, 0x010f); #endif +#if PACKETVER_RE_NUM >= 20190807 +struct PACKET_ZC_SKILLINFO_UPDATE2 { + int16 packetType; + uint16 id; + int inf; + uint16 level; + uint16 sp; + uint16 range2; + uint8 upFlag; + uint16 level2; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SKILLINFO_UPDATE2, 0x0b33); +#else +struct PACKET_ZC_SKILLINFO_UPDATE2 { + int16 packetType; + uint16 id; + int inf; + uint16 level; + uint16 sp; + uint16 range2; + uint8 upFlag; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SKILLINFO_UPDATE2, 0x07e1); +#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 |