summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-04 16:41:09 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-04 16:41:09 +0300
commit05a196194b8270c1ae2e63f8ae31f8a492022388 (patch)
treea00c9c9a009d562db1a95b3f8f77428df0169a21 /src/net/eathena
parent6f06cd42b8e56aaae2be853a31d73d0115a39c2a (diff)
downloadmanaplus-05a196194b8270c1ae2e63f8ae31f8a492022388.tar.gz
manaplus-05a196194b8270c1ae2e63f8ae31f8a492022388.tar.bz2
manaplus-05a196194b8270c1ae2e63f8ae31f8a492022388.tar.xz
manaplus-05a196194b8270c1ae2e63f8ae31f8a492022388.zip
Show unimplimented packet debug message on each unsupported packets parameters.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/beinghandler.cpp39
-rw-r--r--src/net/eathena/beinghandler.h9
-rw-r--r--src/net/eathena/charserverhandler.cpp3
-rw-r--r--src/net/eathena/chathandler.cpp2
-rw-r--r--src/net/eathena/inventoryhandler.cpp2
-rw-r--r--src/net/eathena/loginhandler.cpp1
-rw-r--r--src/net/eathena/mailhandler.cpp2
-rw-r--r--src/net/eathena/partyhandler.cpp2
-rw-r--r--src/net/eathena/playerhandler.cpp7
-rw-r--r--src/net/eathena/playerhandler.h3
-rw-r--r--src/net/eathena/skillhandler.cpp1
-rw-r--r--src/net/eathena/tradehandler.cpp3
12 files changed, 37 insertions, 37 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 747df5d9d..7667edcbb 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -412,7 +412,8 @@ void BeingHandler::handleMessage(Net::MessageIn &msg)
}
}
-Being *BeingHandler::createBeing2(const int id,
+Being *BeingHandler::createBeing2(Net::MessageIn &msg,
+ const int id,
const int16_t job,
const BeingType::BeingType beingType)
{
@@ -449,6 +450,7 @@ Being *BeingHandler::createBeing2(const int id,
break;
case BeingType::CHAT:
default:
+ UNIMPLIMENTEDPACKET;
type = ActorType::Monster;
logger->log("not supported object type: %d, job: %d",
static_cast<int>(beingType), static_cast<int>(job));
@@ -505,10 +507,11 @@ void BeingHandler::processBeingChangeLook2(Net::MessageIn &msg)
if (!localPlayer || !dstBeing)
return;
- processBeingChangeLookContinue(dstBeing, type, id, id2);
+ processBeingChangeLookContinue(msg, dstBeing, type, id, id2);
}
-void BeingHandler::processBeingChangeLookContinue(Being *const dstBeing,
+void BeingHandler::processBeingChangeLookContinue(Net::MessageIn &msg,
+ Being *const dstBeing,
const uint8_t type,
const int id,
const int id2)
@@ -612,10 +615,7 @@ void BeingHandler::processBeingChangeLookContinue(Being *const dstBeing,
localPlayer->imitateOutfit(dstBeing, SPRITE_EVOL4);
break;
default:
- logger->log("QQQ3 CHANGE_LOOKS: unsupported type: "
- "%d, id: %d", type, id);
- logger->log("ID: " + toString(dstBeing->getId()));
- logger->log("name: " + toString(dstBeing->getName()));
+ UNIMPLIMENTEDPACKET;
break;
}
}
@@ -661,7 +661,7 @@ void BeingHandler::processBeingVisible(Net::MessageIn &msg)
if (actorManager->isBlocked(id) == true)
return;
- dstBeing = createBeing2(id, job, type);
+ dstBeing = createBeing2(msg, id, job, type);
if (!dstBeing)
return;
@@ -830,7 +830,7 @@ void BeingHandler::processBeingMove(Net::MessageIn &msg)
if (actorManager->isBlocked(id) == true)
return;
- dstBeing = createBeing2(id, job, type);
+ dstBeing = createBeing2(msg, id, job, type);
if (!dstBeing)
return;
@@ -998,7 +998,7 @@ void BeingHandler::processBeingSpawn(Net::MessageIn &msg)
if (actorManager->isBlocked(id) == true)
return;
- dstBeing = createBeing2(id, job, type);
+ dstBeing = createBeing2(msg, id, job, type);
if (!dstBeing)
return;
@@ -1325,12 +1325,7 @@ void BeingHandler::processBeingAction2(Net::MessageIn &msg)
}
break;
default:
- logger->log("QQQ1 SMSG_BEING_ACTION:");
- if (srcBeing)
- logger->log("srcBeing:" + toString(srcBeing->getId()));
- if (dstBeing)
- logger->log("dstBeing:" + toString(dstBeing->getId()));
- logger->log("type: " + toString(type));
+ UNIMPLIMENTEDPACKET;
break;
}
BLOCK_END("BeingHandler::processBeingAction2")
@@ -1485,7 +1480,9 @@ void BeingHandler::processBeingSoundEffect(Net::MessageIn &msg)
msg.readInt32("source being id");
}
-void BeingHandler::applyPlayerAction(Being *const being, const uint8_t type)
+void BeingHandler::applyPlayerAction(Net::MessageIn &msg,
+ Being *const being,
+ const uint8_t type)
{
switch (type)
{
@@ -1509,9 +1506,7 @@ void BeingHandler::applyPlayerAction(Being *const being, const uint8_t type)
default:
// need set stand state?
- logger->log("QQQ2 SMSG_PLAYER_UPDATE_1:" + toString(type));
- logger->log("being id:" + toString(being->getId()));
- logger->log("being name:" + being->getName());
+ UNIMPLIMENTEDPACKET;
break;
}
}
@@ -1683,7 +1678,7 @@ void BeingHandler::processBeingFakeName(Net::MessageIn &msg)
msg.readUInt8("sy");
msg.skip(4, "unsued");
- Being *const dstBeing = createBeing2(id, job, type);
+ Being *const dstBeing = createBeing2(msg, id, job, type);
dstBeing->setSubtype(job, 0);
dstBeing->setTileCoords(x, y);
dstBeing->setDirection(dir);
@@ -1701,7 +1696,7 @@ void BeingHandler::processBeingStatUpdate1(Net::MessageIn &msg)
if (type != Ea::MANNER)
{
- logger->log("Error: unknown being stat type: %d", type);
+ UNIMPLIMENTEDPACKET;
return;
}
dstBeing->setManner(value);
diff --git a/src/net/eathena/beinghandler.h b/src/net/eathena/beinghandler.h
index 78f12af80..f6fb1df78 100644
--- a/src/net/eathena/beinghandler.h
+++ b/src/net/eathena/beinghandler.h
@@ -47,7 +47,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
void requestRanks(const Rank::Rank rank) const override final;
protected:
- static Being *createBeing2(const int id,
+ static Being *createBeing2(Net::MessageIn &msg,
+ const int id,
const int16_t job,
const BeingType::BeingType beingType);
@@ -81,7 +82,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
static void processBeingChangeDirection(Net::MessageIn &msg);
- static void processBeingChangeLookContinue(Being *const dstBeing,
+ static void processBeingChangeLookContinue(Net::MessageIn &msg,
+ Being *const dstBeing,
const uint8_t type,
const int id,
const int id2);
@@ -92,7 +94,8 @@ class BeingHandler final : public MessageHandler, public Ea::BeingHandler
static void processBeingSoundEffect(Net::MessageIn &msg);
- static void applyPlayerAction(Being *const being,
+ static void applyPlayerAction(Net::MessageIn &msg,
+ Being *const being,
const uint8_t type);
void viewPlayerEquipment(const Being *const being);
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index f813dce6e..f01c3abae 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -521,8 +521,7 @@ void CharServerHandler::processPincodeStatus(Net::MessageIn &msg)
case 8: // pincode was incorrect
break;
default:
- logger->log("processPincodeStatus: unknown pin state: %d",
- static_cast<int>(state));
+ UNIMPLIMENTEDPACKET;
break;
}
}
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index de66468e2..1dfeb7ccb 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -638,7 +638,7 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
return;
}
}
- processWhisperResponseContinue(type);
+ processWhisperResponseContinue(msg, type);
}
void ChatHandler::processChatIgnoreList(Net::MessageIn &msg)
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 278ca03bb..22d01e7a5 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -525,7 +525,7 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
break;
default:
pickup = Pickup::UNKNOWN;
- logger->log("unknown pickup type: %d", err);
+ UNIMPLIMENTEDPACKET;
break;
}
if (localPlayer)
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 35797b21a..26c93212b 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -236,6 +236,7 @@ void LoginHandler::processLoginError2(Net::MessageIn &msg)
default:
// TRANSLATORS: error message
errorMessage = _("Unknown error.");
+ UNIMPLIMENTEDPACKET;
break;
}
client->setState(STATE_ERROR);
diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp
index cf4a0c290..c8fdff4b2 100644
--- a/src/net/eathena/mailhandler.cpp
+++ b/src/net/eathena/mailhandler.cpp
@@ -112,7 +112,7 @@ void MailHandler::processMailOpen(Net::MessageIn &msg)
break;
default:
- logger->log("unknown mail window open flag: %d", flag);
+ UNIMPLIMENTEDPACKET;
break;
}
}
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index dd654f616..87b30eb52 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -268,7 +268,7 @@ void PartyHandler::processPartySettings(Net::MessageIn &msg)
msg.readInt32("party exp");
const int16_t exp = msg.readInt8("exp");
const int16_t item = msg.readInt8("item");
- processPartySettingsContinue(exp, item);
+ processPartySettingsContinue(msg, exp, item);
}
void PartyHandler::processPartyInfo(Net::MessageIn &msg)
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 23990ee2d..aa0cb4f20 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -482,7 +482,7 @@ void PlayerHandler::processPlayerGetExp(Net::MessageIn &msg)
else if (stat == 2)
localPlayer->addJobMessage(exp);
else
- logger->log("unknown exp type");
+ UNIMPLIMENTEDPACKET;
}
// need show particle depend on isQuest flag, for now ignored
}
@@ -563,12 +563,13 @@ void PlayerHandler::processPlayerSkillMessage(Net::MessageIn &msg)
msg.readInt32("type");
}
-void PlayerHandler::setStat(const int type,
+void PlayerHandler::setStat(Net::MessageIn &msg,
+ const int type,
const int base,
const int mod,
const bool notify) const
{
- Ea::PlayerHandler::setStat(type, base, mod, notify);
+ Ea::PlayerHandler::setStat(msg, type, base, mod, notify);
}
void PlayerHandler::processNotifyMapInfo(Net::MessageIn &msg)
diff --git a/src/net/eathena/playerhandler.h b/src/net/eathena/playerhandler.h
index edd6cd897..22a2cd56e 100644
--- a/src/net/eathena/playerhandler.h
+++ b/src/net/eathena/playerhandler.h
@@ -70,7 +70,8 @@ class PlayerHandler final : public MessageHandler, public Ea::PlayerHandler
void setViewEquipment(const bool allow) const override final;
protected:
- void setStat(const int type,
+ void setStat(Net::MessageIn &msg,
+ const int type,
const int base,
const int mod,
const bool notify) const override final;
diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp
index af6dd2857..413ff103f 100644
--- a/src/net/eathena/skillhandler.cpp
+++ b/src/net/eathena/skillhandler.cpp
@@ -414,6 +414,7 @@ void SkillHandler::processSkillFailed(Net::MessageIn &msg)
txt.append(_("You're carrying to much to do this!"));
break;
default:
+ UNIMPLIMENTEDPACKET;
break;
}
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 65951d1e8..562e250b2 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -256,8 +256,7 @@ void TradeHandler::processTradeItemAddResponse(Net::MessageIn &msg)
break;
default:
NotifyManager::notify(NotifyTypes::TRADE_ADD_ERROR);
- logger->log("QQQ SMSG_TRADE_ITEM_ADD_RESPONSE: "
- + toString(res));
+ UNIMPLIMENTEDPACKET;
break;
}
}