diff options
| author | Dastgir <dastgir@users.noreply.github.com> | 2015-08-27 21:21:59 +0530 |
|---|---|---|
| committer | Dastgir <dastgir@users.noreply.github.com> | 2015-08-27 21:21:59 +0530 |
| commit | e2c5e1c60120a3e22fd71ee6b73748a05213fc8e (patch) | |
| tree | f9357ef349422c260e09237e5f6e9811d38e15d7 /src/map/clif.c | |
| parent | bcf51fa5a12d07fe80975bc921ccce3e4f6bf35d (diff) | |
| parent | 2b4b33b06a964e83bf5df9f7f0b795ddf76f9dd0 (diff) | |
| download | hercules-e2c5e1c60120a3e22fd71ee6b73748a05213fc8e.tar.gz hercules-e2c5e1c60120a3e22fd71ee6b73748a05213fc8e.tar.bz2 hercules-e2c5e1c60120a3e22fd71ee6b73748a05213fc8e.tar.xz hercules-e2c5e1c60120a3e22fd71ee6b73748a05213fc8e.zip | |
Merge pull request #674 from HerculesWS/hotkey
Hotkey Rotate Packet Implemented
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 26cf4faac..12565de3c 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9430,31 +9430,29 @@ void clif_parse_TickSend(int fd, struct map_session_data *sd) /// 02b9 { <is skill>.B <id>.L <count>.W }*27 (ZC_SHORTCUT_KEY_LIST) /// 07d9 { <is skill>.B <id>.L <count>.W }*36 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090603) /// 07d9 { <is skill>.B <id>.L <count>.W }*38 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090617) +/// 0a00 <rotate>.B { <is skill>.B <id>.L <count>.W }*38 (ZC_SHORTCUT_KEY_LIST_V3, PACKETVER >= 20141022) void clif_hotkeys_send(struct map_session_data *sd) { #ifdef HOTKEY_SAVING - const int fd = sd->fd; + struct packet_hotkey p; int i; - int offset = 2; -#if PACKETVER < 20090603 - const int cmd = 0x2b9; -#elif PACKETVER < 20141022 - const int cmd = 0x7d9; -#else - const int cmd = 0xa00; - offset = 3; + p.PacketType = hotkeyType; +#if PACKETVER >= 20141022 + p.Rotate = sd->status.hotkey_rowshift; #endif - if (!fd) return; - WFIFOHEAD(fd, offset+MAX_HOTKEYS*7); - WFIFOW(fd, 0) = cmd; - for(i = 0; i < MAX_HOTKEYS; i++) { - WFIFOB(fd, offset + 0 + i * 7) = sd->status.hotkeys[i].type; // type: 0: item, 1: skill - WFIFOL(fd, offset + 1 + i * 7) = sd->status.hotkeys[i].id; // item or skill ID - WFIFOW(fd, offset + 5 + i * 7) = sd->status.hotkeys[i].lv; // item qty or skill level + for(i = 0; i < ARRAYLENGTH(p.hotkey); i++) { + p.hotkey[i].isSkill = sd->status.hotkeys[i].type; + p.hotkey[i].ID = sd->status.hotkeys[i].id; + p.hotkey[i].count = sd->status.hotkeys[i].lv; } - WFIFOSET(fd, packet_len(cmd)); + clif->send(&p, sizeof(p), &sd->bl, SELF); #endif } +void clif_parse_HotkeyRowShift(int fd, struct map_session_data *sd) +{ + int cmd = RFIFOW(fd, 0); + sd->status.hotkey_rowshift = RFIFOB(fd, packet_db[cmd].pos[0]); +} /// Request to update a position on the hotkey bar (CZ_SHORTCUT_KEY_CHANGE). /// 02ba <index>.W <is skill>.B <id>.L <count>.W @@ -19333,4 +19331,5 @@ void clif_defaults(void) { clif->pNPCMarketPurchase = clif_parse_NPCMarketPurchase; /* */ clif->add_random_options = clif_add_random_options; + clif->pHotkeyRowShift = clif_parse_HotkeyRowShift; } |