summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/HPMDataCheck.h1
-rw-r--r--src/common/mmo.h38
-rw-r--r--src/common/packets/packets2019_len_main.h72
-rw-r--r--src/common/packets/packets2019_len_re.h72
-rw-r--r--src/common/packets/packets2019_len_zero.h48
5 files changed, 197 insertions, 34 deletions
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 0a3494cce..1e1d8068f 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -778,7 +778,6 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
{ "packet_equipitem_ack", sizeof(struct packet_equipitem_ack), SERVER_TYPE_MAP },
{ "packet_gm_monster_item", sizeof(struct packet_gm_monster_item), SERVER_TYPE_MAP },
{ "packet_graffiti_entry", sizeof(struct packet_graffiti_entry), SERVER_TYPE_MAP },
- { "packet_hotkey", sizeof(struct packet_hotkey), SERVER_TYPE_MAP },
{ "packet_idle_unit", sizeof(struct packet_idle_unit), SERVER_TYPE_MAP },
{ "packet_idle_unit2", sizeof(struct packet_idle_unit2), SERVER_TYPE_MAP },
{ "packet_item_drop_announce", sizeof(struct packet_item_drop_announce), SERVER_TYPE_MAP },
diff --git a/src/common/mmo.h b/src/common/mmo.h
index eb74d62b3..545d180fd 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -134,22 +134,33 @@
// Comment the following line to disable sc_data saving. [Skotlex]
#define ENABLE_SC_SAVING
-#if PACKETVER >= 20070227
+#if PACKETVER_MAIN_NUM >= 20070711 || PACKETVER_RE_NUM >= 20080827 || PACKETVER_AD_NUM >= 20070711 || PACKETVER_SAK_NUM >= 20070628 || defined(PACKETVER_ZERO)
// Comment the following like to disable server-side hot-key saving support. [Skotlex]
// Note that newer clients no longer save hotkeys in the registry!
#define HOTKEY_SAVING
-#if PACKETVER < 20090603
- // (27 = 9 skills x 3 bars) (0x02b9,191)
- #define MAX_HOTKEYS 27
-#elif PACKETVER < 20090617
- // (36 = 9 skills x 4 bars) (0x07d9,254)
- #define MAX_HOTKEYS 36
-#else // >= 20090617
- // (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
- #define MAX_HOTKEYS 38
-#endif // 20090603
-#endif // 20070227
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190515
+#define MAX_HOTKEYS 38
+#elif PACKETVER_MAIN_NUM >= 20141022 || PACKETVER_RE_NUM >= 20141015 || defined(PACKETVER_ZERO)
+// (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
+#define MAX_HOTKEYS 38
+#elif PACKETVER_MAIN_NUM >= 20090617 || PACKETVER_RE_NUM >= 20090617 || PACKETVER_SAK_NUM >= 20090617
+// (38 = 9 skills x 4 bars & 2 Quickslots)(0x07d9,268)
+#define MAX_HOTKEYS 38
+#elif PACKETVER_MAIN_NUM >= 20090603 || PACKETVER_RE_NUM >= 20090603 || PACKETVER_SAK_NUM >= 20090603
+// (36 = 9 skills x 4 bars) (0x07d9,254)
+#define MAX_HOTKEYS 36
+#elif PACKETVER_MAIN_NUM >= 20070711 || PACKETVER_RE_NUM >= 20080827 || PACKETVER_AD_NUM >= 20070711 || PACKETVER_SAK_NUM >= 20070628
+// (27 = 9 skills x 3 bars) (0x02b9,191)
+#define MAX_HOTKEYS 27
+#endif
+#endif // PACKETVER_MAIN_NUM >= 20070711 || PACKETVER_RE_NUM >= 20080827 || PACKETVER_AD_NUM >= 20070711 || PACKETVER_SAK_NUM >= 20070628 || defined(PACKETVER_ZERO)
+
+#if PACKETVER_MAIN_NUM >= 20190522 || PACKETVER_RE_NUM >= 20190508 || PACKETVER_ZERO_NUM >= 20190515
+#define MAX_HOTKEYS_DB ((MAX_HOTKEYS) * 2)
+#else
+#define MAX_HOTKEYS_DB MAX_HOTKEYS
+#endif
#if PACKETVER >= 20150805 /* Cart Decoration */
#define CART_DECORATION
@@ -732,7 +743,7 @@ struct mmo_charstatus {
struct s_friend friends[MAX_FRIENDS]; //New friend system [Skotlex]
#ifdef HOTKEY_SAVING
- struct hotkey hotkeys[MAX_HOTKEYS];
+ struct hotkey hotkeys[MAX_HOTKEYS_DB];
#endif
bool show_equip;
bool allow_party;
@@ -753,6 +764,7 @@ struct mmo_charstatus {
short attendance_count;
unsigned char hotkey_rowshift;
+ unsigned char hotkey_rowshift2;
int32 title_id; // Achievement Title[Dastgir/Hercules]
};
diff --git a/src/common/packets/packets2019_len_main.h b/src/common/packets/packets2019_len_main.h
index f55db7cd0..0382a72d3 100644
--- a/src/common/packets/packets2019_len_main.h
+++ b/src/common/packets/packets2019_len_main.h
@@ -3946,7 +3946,7 @@ packetLen(0x0a85, 82)
packetLen(0x0a86, -1)
// Packet: 0x0a87
-packetLen(0x0a87, -1)
+packetLen(0x0a87, -1) // ZC_BAN_LIST
// Packet: 0x0a88
packetLen(0x0a88, 2) // CZ_COOLDOWN_RESET
@@ -4404,25 +4404,25 @@ packetLen(0x0b1f, 10)
// Packet: 0x0b20
#if PACKETVER >= 20190403
-packetLen(0x0b20, 271)
+packetLen(0x0b20, 271) // ZC_SHORTCUT_KEY_LIST_V4
#endif
// Packet: 0x0b21
#if PACKETVER >= 20190403
-packetLen(0x0b21, 13)
+packetLen(0x0b21, 13) // CZ_SHORTCUT_KEY_CHANGE
#elif PACKETVER >= 20190306
// removed
#elif PACKETVER >= 20190227
-packetLen(0x0b21, 10)
+packetLen(0x0b21, 10) // CZ_SHORTCUT_KEY_CHANGE
#endif
// Packet: 0x0b22
#if PACKETVER >= 20190403
-packetLen(0x0b22, 5)
+packetLen(0x0b22, 5) // CZ_SHORTCUTKEYBAR_ROTATE
#elif PACKETVER >= 20190306
// removed
#elif PACKETVER >= 20190227
-packetLen(0x0b22, 6)
+packetLen(0x0b22, 6) // CZ_SHORTCUTKEYBAR_ROTATE
#endif
// Packet: 0x0b23
@@ -4445,9 +4445,67 @@ packetLen(0x0b25, 6)
#endif
// Packet: 0x0b26
-#if PACKETVER >= 20190417
+#if PACKETVER >= 20190522
+// removed
+#elif PACKETVER >= 20190508
+packetLen(0x0b26, 16)
+#elif PACKETVER >= 20190417
packetLen(0x0b26, 18)
#endif
+// Packet: 0x0b27
+#if PACKETVER >= 20190508
+packetLen(0x0b27, -1)
+#endif
+
+// Packet: 0x0b28
+#if PACKETVER >= 20190522
+packetLen(0x0b28, 3)
+#elif PACKETVER >= 20190508
+packetLen(0x0b28, 22)
+#endif
+
+// Packet: 0x0b29
+#if PACKETVER >= 20190508
+packetLen(0x0b29, 6)
+#endif
+
+// Packet: 0x0b2a
+#if PACKETVER >= 20190522
+packetLen(0x0b2a, 40)
+#elif PACKETVER >= 20190508
+packetLen(0x0b2a, 6)
+#endif
+
+// Packet: 0x0b2b
+#if PACKETVER >= 20190522
+packetLen(0x0b2b, 11)
+#endif
+
+// Packet: 0x0b2c
+#if PACKETVER >= 20190522
+packetLen(0x0b2c, 3)
+#endif
+
+// Packet: 0x0b2d
+#if PACKETVER >= 20190522
+packetLen(0x0b2d, 11)
+#endif
+
+// Packet: 0x0b2e
+#if PACKETVER >= 20190522
+packetLen(0x0b2e, 4)
+#endif
+
+// Packet: 0x0b2f
+#if PACKETVER >= 20190529
+packetLen(0x0b2f, 73)
+#endif
+
+// Packet: 0x0b30
+#if PACKETVER >= 20190529
+packetLen(0x0b30, -1)
+#endif
+
#endif /* COMMON_PACKETS2019_LEN_MAIN_H */
diff --git a/src/common/packets/packets2019_len_re.h b/src/common/packets/packets2019_len_re.h
index 2f68261cd..c553d9324 100644
--- a/src/common/packets/packets2019_len_re.h
+++ b/src/common/packets/packets2019_len_re.h
@@ -3952,7 +3952,7 @@ packetLen(0x0a85, 82)
packetLen(0x0a86, -1)
// Packet: 0x0a87
-packetLen(0x0a87, -1)
+packetLen(0x0a87, -1) // ZC_BAN_LIST
// Packet: 0x0a88
packetLen(0x0a88, 2) // CZ_COOLDOWN_RESET
@@ -4410,25 +4410,25 @@ packetLen(0x0b1f, 10)
// Packet: 0x0b20
#if PACKETVER >= 20190403
-packetLen(0x0b20, 271)
+packetLen(0x0b20, 271) // ZC_SHORTCUT_KEY_LIST_V4
#endif
// Packet: 0x0b21
#if PACKETVER >= 20190403
-packetLen(0x0b21, 13)
+packetLen(0x0b21, 13) // CZ_SHORTCUT_KEY_CHANGE
#elif PACKETVER >= 20190306
// removed
#elif PACKETVER >= 20190227
-packetLen(0x0b21, 10)
+packetLen(0x0b21, 10) // CZ_SHORTCUT_KEY_CHANGE
#endif
// Packet: 0x0b22
#if PACKETVER >= 20190403
-packetLen(0x0b22, 5)
+packetLen(0x0b22, 5) // CZ_SHORTCUTKEYBAR_ROTATE
#elif PACKETVER >= 20190306
// removed
#elif PACKETVER >= 20190227
-packetLen(0x0b22, 6)
+packetLen(0x0b22, 6) // CZ_SHORTCUTKEYBAR_ROTATE
#endif
// Packet: 0x0b23
@@ -4451,9 +4451,67 @@ packetLen(0x0b25, 6)
#endif
// Packet: 0x0b26
-#if PACKETVER >= 20190417
+#if PACKETVER >= 20190522
+// removed
+#elif PACKETVER >= 20190508
+packetLen(0x0b26, 16)
+#elif PACKETVER >= 20190417
packetLen(0x0b26, 18)
#endif
+// Packet: 0x0b27
+#if PACKETVER >= 20190508
+packetLen(0x0b27, -1)
+#endif
+
+// Packet: 0x0b28
+#if PACKETVER >= 20190522
+packetLen(0x0b28, 3)
+#elif PACKETVER >= 20190508
+packetLen(0x0b28, 22)
+#endif
+
+// Packet: 0x0b29
+#if PACKETVER >= 20190508
+packetLen(0x0b29, 6)
+#endif
+
+// Packet: 0x0b2a
+#if PACKETVER >= 20190522
+packetLen(0x0b2a, 40)
+#elif PACKETVER >= 20190508
+packetLen(0x0b2a, 6)
+#endif
+
+// Packet: 0x0b2b
+#if PACKETVER >= 20190522
+packetLen(0x0b2b, 11)
+#endif
+
+// Packet: 0x0b2c
+#if PACKETVER >= 20190522
+packetLen(0x0b2c, 3)
+#endif
+
+// Packet: 0x0b2d
+#if PACKETVER >= 20190522
+packetLen(0x0b2d, 11)
+#endif
+
+// Packet: 0x0b2e
+#if PACKETVER >= 20190522
+packetLen(0x0b2e, 4)
+#endif
+
+// Packet: 0x0b2f
+#if PACKETVER >= 20190529
+packetLen(0x0b2f, 73)
+#endif
+
+// Packet: 0x0b30
+#if PACKETVER >= 20190529
+packetLen(0x0b30, -1)
+#endif
+
#endif /* COMMON_PACKETS2019_LEN_RE_H */
diff --git a/src/common/packets/packets2019_len_zero.h b/src/common/packets/packets2019_len_zero.h
index 24abdb7bd..3295b26d9 100644
--- a/src/common/packets/packets2019_len_zero.h
+++ b/src/common/packets/packets2019_len_zero.h
@@ -4404,17 +4404,17 @@ packetLen(0x0b1f, 10)
// Packet: 0x0b20
#if PACKETVER >= 20190327
-packetLen(0x0b20, 271)
+packetLen(0x0b20, 271) // ZC_SHORTCUT_KEY_LIST_V4
#endif
// Packet: 0x0b21
#if PACKETVER >= 20190327
-packetLen(0x0b21, 13)
+packetLen(0x0b21, 13) // CZ_SHORTCUT_KEY_CHANGE
#endif
// Packet: 0x0b22
#if PACKETVER >= 20190327
-packetLen(0x0b22, 5)
+packetLen(0x0b22, 5) // CZ_SHORTCUTKEYBAR_ROTATE
#endif
// Packet: 0x0b23
@@ -4433,7 +4433,9 @@ packetLen(0x0b25, 6)
#endif
// Packet: 0x0b26
-#if PACKETVER >= 20190424
+#if PACKETVER >= 20190515
+// removed
+#elif PACKETVER >= 20190424
packetLen(0x0b26, 16)
#endif
@@ -4445,7 +4447,9 @@ packetLen(0x0b27, 2)
#endif
// Packet: 0x0b28
-#if PACKETVER >= 20190502
+#if PACKETVER >= 20190515
+packetLen(0x0b28, 3)
+#elif PACKETVER >= 20190502
packetLen(0x0b28, 22)
#elif PACKETVER >= 20190424
packetLen(0x0b28, -1)
@@ -4459,9 +4463,41 @@ packetLen(0x0b29, 3)
#endif
// Packet: 0x0b2a
-#if PACKETVER >= 20190502
+#if PACKETVER >= 20190529
+packetLen(0x0b2a, 40)
+#elif PACKETVER >= 20190502
packetLen(0x0b2a, 6)
#endif
+// Packet: 0x0b2b
+#if PACKETVER >= 20190515
+packetLen(0x0b2b, 11)
+#endif
+
+// Packet: 0x0b2c
+#if PACKETVER >= 20190515
+packetLen(0x0b2c, 3)
+#endif
+
+// Packet: 0x0b2d
+#if PACKETVER >= 20190515
+packetLen(0x0b2d, 11)
+#endif
+
+// Packet: 0x0b2e
+#if PACKETVER >= 20190515
+packetLen(0x0b2e, 4)
+#endif
+
+// Packet: 0x0b2f
+#if PACKETVER >= 20190529
+packetLen(0x0b2f, 73)
+#endif
+
+// Packet: 0x0b30
+#if PACKETVER >= 20190529
+packetLen(0x0b30, -1)
+#endif
+
#endif /* COMMON_PACKETS2019_LEN_ZERO_H */
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 09:59:23 +0000