summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/beingrecv.cpp14
-rw-r--r--src/net/eathena/chatrecv.cpp12
-rw-r--r--src/net/eathena/inventoryrecv.cpp4
-rw-r--r--src/net/eathena/loginrecv.cpp2
-rw-r--r--src/net/eathena/mailrecv.cpp12
-rw-r--r--src/net/eathena/playerhandler.cpp2
-rw-r--r--src/net/eathena/playerrecv.cpp2
-rw-r--r--src/net/eathena/skillrecv.cpp2
-rw-r--r--src/net/eathena/traderecv.cpp2
9 files changed, 27 insertions, 25 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp
index 060ac2724..c5c7acfcc 100644
--- a/src/net/eathena/beingrecv.cpp
+++ b/src/net/eathena/beingrecv.cpp
@@ -253,7 +253,7 @@ void BeingRecv::processBeingChangeLookContinue(const Net::MessageIn &msg,
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL6);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(type);
break;
}
}
@@ -783,7 +783,7 @@ void BeingRecv::processMapType(Net::MessageIn &msg)
if (type == 19)
NotifyManager::notify(NotifyTypes::MAP_TYPE_BATTLEFIELD);
else
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(type);
}
void BeingRecv::processSkillCasting(Net::MessageIn &msg)
@@ -802,7 +802,7 @@ void BeingRecv::processSkillCasting(Net::MessageIn &msg)
if (srcId == BeingId_zero)
{
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(0);
return;
}
else if (dstId != BeingId_zero)
@@ -1010,7 +1010,7 @@ void BeingRecv::processBeingAction2(Net::MessageIn &msg)
default:
case AttackType::MISS:
case AttackType::SKILLMISS:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(CAST_S32(type));
break;
}
BLOCK_END("BeingRecv::processBeingAction2")
@@ -1368,7 +1368,7 @@ void BeingRecv::processBeingStatUpdate1(Net::MessageIn &msg)
if (type != Sp::MANNER)
{
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(type);
return;
}
dstBeing->setManner(value);
@@ -1716,7 +1716,7 @@ Being *BeingRecv::createBeing2(Net::MessageIn &msg,
break;
case BeingType::CHAT:
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(beingType);
type = ActorType::Monster;
logger->log("not supported object type: %d, job: %d",
CAST_S32(beingType), CAST_S32(job));
@@ -1802,7 +1802,7 @@ void BeingRecv::applyPlayerAction(Net::MessageIn &msg,
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(type);
break;
}
}
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
index 553fb748e..2eb763cdf 100644
--- a/src/net/eathena/chatrecv.cpp
+++ b/src/net/eathena/chatrecv.cpp
@@ -415,7 +415,7 @@ void ChatRecv::processChatRoomLeave(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::ROOM_KICKED, name);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(status);
break;
}
if (localPlayer && name == localPlayer->getName())
@@ -578,7 +578,7 @@ void ChatRecv::processChatRoomCreateAck(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::ROOM_ALREADY_EXISTS);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(result);
break;
}
mChatRoom.clear();
@@ -619,7 +619,7 @@ void ChatRecv::processChatRoomJoinFailed(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::ROOM_ERROR_RACE);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(result);
}
}
@@ -669,7 +669,7 @@ void ChatRecv::processChatRoomRoleChange(Net::MessageIn &msg)
// dont show normal role
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(role);
break;
}
}
@@ -702,7 +702,7 @@ void ChatRecv::processMannerMessage(Net::MessageIn &msg)
case 5:
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(result);
break;
}
}
@@ -721,7 +721,7 @@ void ChatRecv::processChatSilence(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::MANNER_NEGATIVE_POINTS, name);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(result);
break;
}
}
diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp
index 3b0114cb9..f1d17a6ca 100644
--- a/src/net/eathena/inventoryrecv.cpp
+++ b/src/net/eathena/inventoryrecv.cpp
@@ -246,7 +246,7 @@ void InventoryRecv::processPlayerInventoryAdd(Net::MessageIn &msg)
break;
default:
pickup = Pickup::UNKNOWN;
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(err);
break;
}
if (localPlayer)
@@ -980,7 +980,7 @@ void InventoryRecv::processPlayerRefine(Net::MessageIn &msg)
notifyType = NotifyTypes::REFINE_DOWNGRADE;
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(flag);
notifyType = NotifyTypes::REFINE_UNKNOWN;
break;
}
diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp
index 220257ba6..c9164e4e2 100644
--- a/src/net/eathena/loginrecv.cpp
+++ b/src/net/eathena/loginrecv.cpp
@@ -114,7 +114,7 @@ void LoginRecv::processLoginError2(Net::MessageIn &msg)
default:
// TRANSLATORS: error message
errorMessage = _("Unknown error.");
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(code);
break;
}
client->setState(State::ERROR);
diff --git a/src/net/eathena/mailrecv.cpp b/src/net/eathena/mailrecv.cpp
index e89c730e9..4450be2af 100644
--- a/src/net/eathena/mailrecv.cpp
+++ b/src/net/eathena/mailrecv.cpp
@@ -62,7 +62,7 @@ void MailRecv::processMailOpen(Net::MessageIn &msg)
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(flag);
break;
}
}
@@ -115,7 +115,8 @@ void MailRecv::processReadMail(Net::MessageIn &msg)
void MailRecv::processGetAttachment(Net::MessageIn &msg)
{
- switch (msg.readUInt8("flag"))
+ const uint8_t flag = msg.readUInt8("flag");
+ switch (flag)
{
case 0:
NotifyManager::notify(NotifyTypes::MAIL_GET_ATTACH_OK);
@@ -127,14 +128,15 @@ void MailRecv::processGetAttachment(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::MAIL_GET_ATTACH_TOO_MANY_ITEMS);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(flag);
break;
}
}
void MailRecv::processSendMailAck(Net::MessageIn &msg)
{
- switch (msg.readUInt8("fail flag"))
+ const uint8_t flag = msg.readUInt8("fail flag");
+ switch (flag)
{
case 0:
NotifyManager::notify(NotifyTypes::MAIL_SEND_OK);
@@ -143,7 +145,7 @@ void MailRecv::processSendMailAck(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::MAIL_SEND_ERROR);
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(flag);
break;
}
}
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 8a6a7e878..429ea1f21 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -438,7 +438,7 @@ void PlayerHandler::setStat(Net::MessageIn &msg,
break;
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(type);
break;
}
}
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 9b5c50c96..28f3fe96d 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -195,7 +195,7 @@ void PlayerRecv::processPlayerGetExp(Net::MessageIn &msg)
else if (stat == 2)
localPlayer->addJobMessage(exp);
else
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(stat);
}
// need show particle depend on isQuest flag, for now ignored
}
diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp
index 52f2e3b2b..8053dce54 100644
--- a/src/net/eathena/skillrecv.cpp
+++ b/src/net/eathena/skillrecv.cpp
@@ -339,7 +339,7 @@ void SkillRecv::processSkillFailed(Net::MessageIn &msg)
}
default:
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(reason);
break;
}
diff --git a/src/net/eathena/traderecv.cpp b/src/net/eathena/traderecv.cpp
index cdae4788e..3d7d51dfe 100644
--- a/src/net/eathena/traderecv.cpp
+++ b/src/net/eathena/traderecv.cpp
@@ -157,7 +157,7 @@ void TradeRecv::processTradeItemAddResponse(Net::MessageIn &msg)
break;
default:
NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
- UNIMPLIMENTEDPACKET;
+ UNIMPLIMENTEDPACKETFIELD(res);
break;
}
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 01:58:22 +0000