From e7e25d4030ddd4b5a6e48af3f2dc48dcf6039570 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 8 May 2019 23:36:30 +0300 Subject: Extract hotkey packet data into separate struct --- src/map/packets_struct.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 33b7759ce..d90d6dc97 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -1423,21 +1423,21 @@ struct packet_party_leader_changed { uint32 new_leader_aid; } __attribute__((packed)); -struct packet_hotkey { #ifdef HOTKEY_SAVING +struct hotkey_data { + int8 isSkill; // 0: Item, 1:Skill + 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 { - int8 isSkill; // 0: Item, 1:Skill - uint32 ID; // Item/Skill ID - int16 count; // Item Quantity/Skill Level - } hotkey[MAX_HOTKEYS]; -#else // not HOTKEY_SAVING - UNAVAILABLE_STRUCT; -#endif // HOTKEY_SAVING + struct hotkey_data hotkey[MAX_HOTKEYS]; } __attribute__((packed)); +#endif // HOTKEY_SAVING /** * MISSION_HUNT_INFO (PACKETVER >= 20141022) -- cgit v1.2.3-60-g2f50