summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/net/eathena/packetsout.inc2
-rw-r--r--src/net/eathena/playerhandler.cpp7
-rw-r--r--src/net/eathena/playerhandler.h2
-rw-r--r--src/net/playerhandler.h3
-rw-r--r--src/net/tmwa/playerhandler.cpp4
-rw-r--r--src/net/tmwa/playerhandler.h2
6 files changed, 20 insertions, 0 deletions
diff --git a/src/net/eathena/packetsout.inc b/src/net/eathena/packetsout.inc
index 6b45709ef..6cc8117ad 100644
--- a/src/net/eathena/packetsout.inc
+++ b/src/net/eathena/packetsout.inc
@@ -355,6 +355,7 @@ packet(CMSG_NPC_BARTER_CLOSE, 0x0000, 0, nullptr);
packet(CMSG_CAMERA_INFO, 0x0000, 0, nullptr);
packet(CMSG_NPC_BARTER_BUY, 0x0000, 0, nullptr);
packet(CMSG_CLIENT_VERSION, 0x0000, 0, nullptr);
+packet(CMSG_PLAYER_STYLE_CLOSE, 0x0000, 0, nullptr);
#else
// 20040713
if (packetVersion >= 20040713)
@@ -1372,6 +1373,7 @@ if (packetVersion >= 20151001)
if (packetVersion >= 20151104)
{
packet(CMSG_PLAYER_SELECT_STYLE, 0x0a46, 14, clif->pReqStyleChange);
+ packet(CMSG_PLAYER_STYLE_CLOSE, 0x0a48, 2, clif->pStyleClose);
}
// 20160323
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 19146a836..cefbcf285 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -836,6 +836,13 @@ void PlayerHandler::setTitle(const int titleId) const
outMsg.writeInt32(titleId, "title");
}
+void PlayerHandler::closeStyleWindow() const
+{
+ if (packetVersion < 20151104)
+ return;
+ createOutPacket(CMSG_PLAYER_STYLE_CLOSE);
+}
+
#undef setStatComplex
} // namespace EAthena
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index a438fdac2..bb5facaa9 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -85,6 +85,8 @@ class PlayerHandler final : public Ea::PlayerHandler
const Notify notify) const override final;
void setTitle(const int titleId) const override final;
+
+ void closeStyleWindow() const override final;
};
} // namespace EAthena
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index c35971c65..68d80cf66 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -112,6 +112,7 @@ class PlayerHandler notfinal
const int64_t base,
const int mod,
const Notify notify) const = 0;
+
virtual void selectStyle(const int headColor,
const int headStyle,
const int bodyColor,
@@ -121,6 +122,8 @@ class PlayerHandler notfinal
const int bodyStyle) const = 0;
virtual void setTitle(const int titleId) const = 0;
+
+ virtual void closeStyleWindow() const = 0;
};
} // namespace Net
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index f70aac88f..ed165d044 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -510,4 +510,8 @@ void PlayerHandler::setTitle(const int titleId A_UNUSED) const
{
}
+void PlayerHandler::closeStyleWindow() const
+{
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index e5d1ff2df..d9edaa2bd 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -96,6 +96,8 @@ class PlayerHandler final : public Ea::PlayerHandler
const Notify notify) const override final;
void setTitle(const int titleId) const override final;
+
+ void closeStyleWindow() const override final;
};
} // namespace TmwAthena