summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-05-08 23:36:30 +0300
committerAndrei Karas <akaras@inbox.ru>2019-06-02 00:23:24 +0300
commite7e25d4030ddd4b5a6e48af3f2dc48dcf6039570 (patch)
tree6e41bad49812449bbcb7d486a7466aa0f060ff0f
parent6fd206b5e333717c748c9815d956075f8c973b98 (diff)
downloadhercules-e7e25d4030ddd4b5a6e48af3f2dc48dcf6039570.tar.gz
hercules-e7e25d4030ddd4b5a6e48af3f2dc48dcf6039570.tar.bz2
hercules-e7e25d4030ddd4b5a6e48af3f2dc48dcf6039570.tar.xz
hercules-e7e25d4030ddd4b5a6e48af3f2dc48dcf6039570.zip
Extract hotkey packet data into separate struct
-rw-r--r--src/map/packets_struct.h18
1 files 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)