summaryrefslogtreecommitdiff
path: root/src/map/clif.c
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-05-09 18:12:01 +0300
committerAndrei Karas <akaras@inbox.ru>2019-06-02 00:23:24 +0300
commit70b5e954990b857946d81750263bcf11b06414ce (patch)
tree7bd3d13506ba2deac4aa7b21fc51c46bc5ff95ac /src/map/clif.c
parentd13334aeb2d3439d89530a1e88a968a977079be9 (diff)
downloadhercules-70b5e954990b857946d81750263bcf11b06414ce.tar.gz
hercules-70b5e954990b857946d81750263bcf11b06414ce.tar.bz2
hercules-70b5e954990b857946d81750263bcf11b06414ce.tar.xz
hercules-70b5e954990b857946d81750263bcf11b06414ce.zip
Use separate field hotkey_rowshift for each hotkeys group
Diffstat (limited to 'src/map/clif.c')
-rw-r--r--src/map/clif.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 9f751a68d..f5fcc7d9d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -10849,7 +10849,10 @@ static void clif_hotkeys_send(struct map_session_data *sd, int tab)
struct PACKET_ZC_SHORTCUT_KEY_LIST p;
p.packetType = HEADER_ZC_SHORTCUT_KEY_LIST;
#if PACKETVER_MAIN_NUM >= 20141022 || PACKETVER_RE_NUM >= 20141015 || defined(PACKETVER_ZERO)
- p.rotate = sd->status.hotkey_rowshift;
+ if (tab == 0)
+ p.rotate = sd->status.hotkey_rowshift;
+ else
+ p.rotate = sd->status.hotkey_rowshift2;
#endif
#if PACKETVER_RE_NUM >= 20190508
p.tab = tab;
@@ -10878,8 +10881,10 @@ static void clif_parse_HotkeyRowShift2(int fd, struct map_session_data *sd)
{
#if PACKETVER_RE_NUM >= 20190508
const struct PACKET_CZ_SHORTCUTKEYBAR_ROTATE2 *p = RFIFOP(fd, 0);
- // need use p->tab
- sd->status.hotkey_rowshift = p->rowshift;
+ if (p->tab == 0)
+ sd->status.hotkey_rowshift = p->rowshift;
+ else
+ sd->status.hotkey_rowshift2 = p->rowshift;
#endif
}