summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-06-26 22:37:08 +0300
committerAndrei Karas <akaras@inbox.ru>2019-06-26 22:37:08 +0300
commit653431655169659331999f4f2d63aa05cfcf3134 (patch)
tree64be2e53c95adc1935bcce44154134270d007c90
parent888c5621cfe3a646f1f21290d3c5cd027eeba0a9 (diff)
downloadmv-653431655169659331999f4f2d63aa05cfcf3134.tar.gz
mv-653431655169659331999f4f2d63aa05cfcf3134.tar.bz2
mv-653431655169659331999f4f2d63aa05cfcf3134.tar.xz
mv-653431655169659331999f4f2d63aa05cfcf3134.zip
Update packet CMSG_SHORTCUTS_ROW_SHIFT
-rw-r--r--src/net/eathena/packetsout.inc14
-rw-r--r--src/net/eathena/playerhandler.cpp8
-rw-r--r--src/net/eathena/playerhandler.h3
-rw-r--r--src/net/playerhandler.h3
-rw-r--r--src/net/tmwa/playerhandler.cpp3
-rw-r--r--src/net/tmwa/playerhandler.h3
6 files changed, 28 insertions, 6 deletions
diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc
index 5f5aa4847..f96c2563f 100644
--- a/src/net/eathena/packetsout.inc
+++ b/src/net/eathena/packetsout.inc
@@ -1299,7 +1299,7 @@ if (packetVersion >= 20140122)
// 20140129
if (packetVersion >= 20140129)
{
- packet(CMSG_SHORTCUTS_ROW_SHIFT, 0x0a01, 3, clif->pHotkeyRowShift);
+ packet(CMSG_SHORTCUTS_ROW_SHIFT, 0x0a01, 3, clif->pHotkeyRowShift1);
}
// 20140212
@@ -1629,6 +1629,18 @@ if (packetVersionMain >= 20190227)
packet(CMSG_MAP_PING2, 0x0b1c, 2, clif->pPing);
}
+// 20190508 re
+if (packetVersionRe >= 20190508)
+{
+ packet(CMSG_SHORTCUTS_ROW_SHIFT, 0x0b22, 3, clif->pHotkeyRowShift2);
+}
+
+// 20190522 main
+if (packetVersionMain >= 20190522)
+{
+ 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 cefbcf285..551ab0144 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -460,11 +460,17 @@ void PlayerHandler::setShortcut(const int idx,
outMsg.writeInt16(CAST_S16(level), "level");
}
-void PlayerHandler::shortcutShiftRow(const int row) const
+void PlayerHandler::shortcutShiftRow(const int row,
+ const int tab) const
{
if (packetVersion < 20140129)
return;
createOutPacket(CMSG_SHORTCUTS_ROW_SHIFT);
+ if (packetVersionMain >= 20190522 ||
+ packetVersionRe >= 20190508)
+ {
+ outMsg.writeInt16(CAST_S16(tab), "tab");
+ }
outMsg.writeInt8(CAST_S8(row), "row");
}
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index bb5facaa9..26bb21f85 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -60,7 +60,8 @@ class PlayerHandler final : public Ea::PlayerHandler
const uint8_t type,
const int id,
const int level) const override final;
- void shortcutShiftRow(const int row) const override final;
+ void shortcutShiftRow(const int row,
+ const int tab) const override final;
void removeOption() const override final;
void changeCart(const int type) const override final;
void setMemo() const override final;
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 68d80cf66..20e0b8855 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -88,7 +88,8 @@ class PlayerHandler notfinal
const int id,
const int level) const = 0;
- virtual void shortcutShiftRow(const int row) const = 0;
+ virtual void shortcutShiftRow(const int row,
+ const int tab) const = 0;
virtual void removeOption() const = 0;
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index ed165d044..e172b5096 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -204,7 +204,8 @@ void PlayerHandler::revive() const
{
}
-void PlayerHandler::shortcutShiftRow(const int row A_UNUSED) const
+void PlayerHandler::shortcutShiftRow(const int row A_UNUSED,
+ const int tab A_UNUSED) const
{
}
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index d9edaa2bd..194faaa9d 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -62,7 +62,8 @@ class PlayerHandler final : public Ea::PlayerHandler
const int id,
const int level) const override final;
- void shortcutShiftRow(const int row) const override final;
+ void shortcutShiftRow(const int row,
+ const int tab) const override final;
void removeOption() const override final;