diff options
| author | Andrei Karas <akaras@inbox.ru> | 2019-05-09 02:34:00 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2019-06-02 00:23:24 +0300 |
| commit | 441470decb97f738ea4c854cbf5138e8eeac2bb4 (patch) | |
| tree | 73a406b22e055e6b1d2c7da92a5fc801e9618347 /src/map/packets_struct.h | |
| parent | 62ee0d94b98493e60d41c8a5a3ec27a7246a21e9 (diff) | |
| download | hercules-441470decb97f738ea4c854cbf5138e8eeac2bb4.tar.gz hercules-441470decb97f738ea4c854cbf5138e8eeac2bb4.tar.bz2 hercules-441470decb97f738ea4c854cbf5138e8eeac2bb4.tar.xz hercules-441470decb97f738ea4c854cbf5138e8eeac2bb4.zip | |
Update packet ZC_SHORTCUT_KEY_LIST
Diffstat (limited to 'src/map/packets_struct.h')
| -rw-r--r-- | src/map/packets_struct.h | 53 |
1 files changed, 39 insertions, 14 deletions
diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index d90d6dc97..4e3d7de84 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -39,13 +39,6 @@ enum packet_headers { banking_checkType = 0x9a6, cart_additem_ackType = 0x12c, sc_notickType = 0x196, -#if PACKETVER >= 20141022 - hotkeyType = 0xa00, -#elif PACKETVER >= 20090603 - hotkeyType = 0x7d9, -#else - hotkeyType = 0x2b9, -#endif #if PACKETVER >= 20150226 cartaddType = 0xa0b, #elif PACKETVER >= 5 @@ -1426,17 +1419,49 @@ struct packet_party_leader_changed { #ifdef HOTKEY_SAVING struct hotkey_data { int8 isSkill; // 0: Item, 1:Skill - uint32 ID; // Item/Skill ID + uint32 id; // Item/Skill ID int16 count; // Item Quantity/Skill Level } __attribute__((packed)); -struct packet_hotkey { - int16 PacketType; -#if PACKETVER >= 20141022 - int8 Rotate; -#endif - struct hotkey_data hotkey[MAX_HOTKEYS]; +#if PACKETVER_RE_NUM >= 20190508 +#define MAX_HOTKEYS_PACKET 38 +struct PACKET_ZC_SHORTCUT_KEY_LIST { + int16 packetType; + int8 rotate; + int16 tab; + struct hotkey_data hotkey[MAX_HOTKEYS_PACKET]; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SHORTCUT_KEY_LIST, 0x0b20); +#elif PACKETVER_MAIN_NUM >= 20141022 || PACKETVER_RE_NUM >= 20141015 || defined(PACKETVER_ZERO) +#define MAX_HOTKEYS_PACKET 38 +struct PACKET_ZC_SHORTCUT_KEY_LIST { + int16 packetType; + int8 rotate; + struct hotkey_data hotkey[MAX_HOTKEYS_PACKET]; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SHORTCUT_KEY_LIST, 0x0a00); +#elif PACKETVER_MAIN_NUM >= 20090617 || PACKETVER_RE_NUM >= 20090617 || PACKETVER_SAK_NUM >= 20090617 +#define MAX_HOTKEYS_PACKET 38 +struct PACKET_ZC_SHORTCUT_KEY_LIST { + int16 packetType; + struct hotkey_data hotkey[MAX_HOTKEYS_PACKET]; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SHORTCUT_KEY_LIST, 0x07d9); +#elif PACKETVER_MAIN_NUM >= 20090603 || PACKETVER_RE_NUM >= 20090603 || PACKETVER_SAK_NUM >= 20090603 +#define MAX_HOTKEYS_PACKET 36 +struct PACKET_ZC_SHORTCUT_KEY_LIST { + int16 packetType; + struct hotkey_data hotkey[MAX_HOTKEYS_PACKET]; +} __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SHORTCUT_KEY_LIST, 0x07d9); +#elif PACKETVER_MAIN_NUM >= 20070711 || PACKETVER_RE_NUM >= 20080827 || PACKETVER_AD_NUM >= 20070711 || PACKETVER_SAK_NUM >= 20070628 +#define MAX_HOTKEYS_PACKET 27 +struct PACKET_ZC_SHORTCUT_KEY_LIST { + int16 packetType; + struct hotkey_data hotkey[MAX_HOTKEYS_PACKET]; } __attribute__((packed)); +DEFINE_PACKET_HEADER(ZC_SHORTCUT_KEY_LIST, 0x02b9); +#endif #endif // HOTKEY_SAVING /** |