From 205fb78eab4072466c17116f7e39323aaa03ed2c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 19 Aug 2019 22:09:10 +0300 Subject: Update shortcuts related packets for zero --- src/net/eathena/packetsin.inc | 6 ++++++ src/net/eathena/packetsout.inc | 7 +++++++ src/net/eathena/playerhandler.cpp | 6 ++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/net/eathena/packetsin.inc b/src/net/eathena/packetsin.inc index 0fa21fd70..3b50b44c1 100644 --- a/src/net/eathena/packetsin.inc +++ b/src/net/eathena/packetsin.inc @@ -1811,6 +1811,12 @@ if (packetVersionRe >= 20190605) packet(SMSG_HOMUNCULUS_INFO, 0x0b2f, 73, &HomunculusRecv::processHomunculusInfo3, 20190605); } +// 20190605 zero +if (packetVersionZero >= 20190605) +{ + packet(SMSG_PLAYER_SHORTCUTS, 0x0b20, 271, &PlayerRecv::processPlayerShortcuts3, 20190605); +} + // 20190619 main if (packetVersionMain >= 20190619) { diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc index 5b905d20c..124b58257 100644 --- a/src/net/eathena/packetsout.inc +++ b/src/net/eathena/packetsout.inc @@ -1643,6 +1643,13 @@ if (packetVersionMain >= 20190522) packet(CMSG_SHORTCUTS_ROW_SHIFT, 0x0b22, 3, clif->pHotkeyRowShift2); } +// 20190605 zero +if (packetVersionZero >= 20190605) +{ + packet(CMSG_SET_SHORTCUTS, 0x0b21, 13, clif->pHotkey2); + packet(CMSG_SHORTCUTS_ROW_SHIFT, 0x0b22, 3, clif->pHotkeyRowShift2); +} + // 20160622 if (packetVersion >= 20160622) { diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index d3b0e6803..0e206f2b7 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -456,7 +456,8 @@ void PlayerHandler::setShortcut(const int idx, { createOutPacket(CMSG_SET_SHORTCUTS); if (packetVersionMain >= 20190522 || - packetVersionRe >= 20190508) + packetVersionRe >= 20190508 || + packetVersionZero >= 20190605) { outMsg.writeInt16(CAST_S16(tab), "tab"); } @@ -473,7 +474,8 @@ void PlayerHandler::shortcutShiftRow(const int row, return; createOutPacket(CMSG_SHORTCUTS_ROW_SHIFT); if (packetVersionMain >= 20190522 || - packetVersionRe >= 20190508) + packetVersionRe >= 20190508 || + packetVersionZero >= 20190605) { outMsg.writeInt16(CAST_S16(tab), "tab"); } -- cgit v1.2.3-70-g09d2