5 files changed, 8 insertions, 9 deletions
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index bbae0a1bd..6d473a853 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -213,7 +213,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
             dstBeing->setLook(CAST_U16(id));
             break;
         default:
-            UNIMPLIMENTEDPACKET;
+            UNIMPLIMENTEDPACKETFIELD(type);
             break;
     }
 }
@@ -1369,7 +1369,7 @@ void BeingRecv::applyPlayerAction(Net::MessageIn &msg,
             break;
 
         default:
-            UNIMPLIMENTEDPACKET;
+            UNIMPLIMENTEDPACKETFIELD(type);
             break;
     }
 }
diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp
index fbada97cf..1586c5aa7 100644
--- a/src/net/tmwa/inventoryrecv.cpp
+++ b/src/net/tmwa/inventoryrecv.cpp
@@ -198,7 +198,7 @@ void InventoryRecv::processPlayerInventoryAdd(Net::MessageIn &msg)
                 break;
             default:
                 pickup = Pickup::UNKNOWN;
-                UNIMPLIMENTEDPACKET;
+                UNIMPLIMENTEDPACKETFIELD(err);
                 break;
         }
         if (localPlayer)
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index c34aca907..4ec61960f 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -413,10 +413,9 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
             break;
 
         default:
-            UNIMPLIMENTEDPACKET;
+            UNIMPLIMENTEDPACKETFIELD(type);
             break;
     }
-
 }
 
 #undef setStatComplex
diff --git a/src/net/tmwa/skillrecv.cpp b/src/net/tmwa/skillrecv.cpp
index df914568b..9ad5023b1 100644
--- a/src/net/tmwa/skillrecv.cpp
+++ b/src/net/tmwa/skillrecv.cpp
@@ -133,7 +133,7 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
                 txt = _("Cannot shout!");
                 break;
             default:
-                UNIMPLIMENTEDPACKET;
+                UNIMPLIMENTEDPACKETFIELD(bskill);
                 break;
         }
 
@@ -185,7 +185,7 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
             default:
                 // TRANSLATORS: error message
                 txt.append(_("Huh? What's that?"));
-                UNIMPLIMENTEDPACKET;
+                UNIMPLIMENTEDPACKETFIELD(reason);
                 break;
         }
     }
@@ -206,7 +206,7 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
                 txt = _("Poison had no effect...");
                 break;
             default:
-                UNIMPLIMENTEDPACKET;
+                UNIMPLIMENTEDPACKETFIELD(skillId);
                 break;
         }
     }
diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp
index feb65c3a6..393502273 100644
--- a/src/net/tmwa/traderecv.cpp
+++ b/src/net/tmwa/traderecv.cpp
@@ -145,7 +145,7 @@ void TradeRecv::processTradeItemAddResponse(Net::MessageIn &msg)
             break;
         default:
             NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
-            UNIMPLIMENTEDPACKET;
+            UNIMPLIMENTEDPACKETFIELD(res);
             logger->log("QQQ SMSG_TRADE_ITEM_ADD_RESPONSE: "
                         + toString(res));
             break;