TMWA: Added debug logging of sent messages

3 files changed, 16 insertions, 2 deletions

diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 12c9419a..a886fb4d 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -31,6 +31,9 @@ namespace TmwAthena {
 
 MessageOut::MessageOut(uint16_t id)
 {
+#ifdef DEBUG
+    logger->log("Sending %s (0x%x)", Network::mInstance->messageName(id), id);
+#endif
     writeInt16(id);
 }
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 353495da..b448dc4f 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -45,9 +45,9 @@ struct PacketInfo
 };
 
 // indicator for a variable-length packet
-const uint16_t VAR = 1;
+constexpr uint16_t VAR = 1;
 
-static const PacketInfo packet_infos[] = {
+static constexpr PacketInfo packet_infos[] = {
     // login server messages
     { SMSG_UPDATE_HOST,               VAR, "SMSG_UPDATE_HOST" },
     { CMSG_LOGIN_REGISTER,            55, "CMSG_LOGIN_REGISTER" },
@@ -353,6 +353,15 @@ void Network::clearHandlers()
     mMessageHandlers.clear();
 }
 
+const char *Network::messageName(uint16_t id) const
+{
+    auto packetInfoIt = mPacketInfo.find(id);
+    if (packetInfoIt != mPacketInfo.end())
+        return packetInfoIt->second->name;
+
+    return "Unknown";
+}
+
 void Network::dispatchMessages()
 {
     MutexLocker lock(&mMutex);
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 53f15761..b27d1eda 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -66,6 +66,8 @@ class Network
 
         void clearHandlers();
 
+        const char *messageName(uint16_t id) const;
+
         int getState() const { return mState; }
 
         const std::string &getError() const { return mError; }