summaryrefslogtreecommitdiff
path: root/src/net/ea
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/ea')
-rw-r--r--src/net/ea/beinghandler.cpp7
-rw-r--r--src/net/ea/chathandler.cpp9
-rw-r--r--src/net/ea/chathandler.h3
-rw-r--r--src/net/ea/npchandler.cpp2
-rw-r--r--src/net/ea/partyhandler.cpp7
-rw-r--r--src/net/ea/partyhandler.h3
-rw-r--r--src/net/ea/playerhandler.cpp18
-rw-r--r--src/net/ea/playerhandler.h3
8 files changed, 24 insertions, 28 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 54f13472e..1af57becb 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -246,12 +246,7 @@ void BeingHandler::processBeingAction(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::processBeingAction")
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 95d05bf1e..a08b2b9e6 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -98,7 +98,8 @@ std::string ChatHandler::getLastWhisperNick()
return nick;
}
-void ChatHandler::processWhisperResponseContinue(const uint8_t type)
+void ChatHandler::processWhisperResponseContinue(Net::MessageIn &msg,
+ const uint8_t type)
{
const std::string nick = getPopLastWhisperNick();
switch (type)
@@ -137,11 +138,7 @@ void ChatHandler::processWhisperResponseContinue(const uint8_t type)
}
break;
default:
- if (logger)
- {
- logger->log("QQQ SMSG_WHISPER_RESPONSE:"
- + toString(type));
- }
+ UNIMPLIMENTEDPACKET;
break;
}
BLOCK_END("ChatHandler::processWhisperResponse")
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 2ed9282f8..c58c6e534 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -53,7 +53,8 @@ class ChatHandler notfinal : public Net::ChatHandler
void clear() override final;
- static void processWhisperResponseContinue(const uint8_t type);
+ static void processWhisperResponseContinue(Net::MessageIn &msg,
+ const uint8_t type);
protected:
static std::string getPopLastWhisperNick();
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 40c6b5256..a88025b7f 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -194,7 +194,7 @@ void NpcHandler::processNpcCommand(Net::MessageIn &msg)
break;
}
default:
- logger->log("unknown npc command: %d", cmd);
+ UNIMPLIMENTEDPACKET;
break;
}
}
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 03f210f73..f30a0a83f 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -83,7 +83,8 @@ void PartyHandler::processPartyCreate(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::PARTY_CREATED);
}
-void PartyHandler::processPartySettingsContinue(const int16_t exp,
+void PartyHandler::processPartySettingsContinue(Net::MessageIn &msg,
+ const int16_t exp,
const int16_t item)
{
switch (exp)
@@ -107,7 +108,7 @@ void PartyHandler::processPartySettingsContinue(const int16_t exp,
NotifyManager::notify(NotifyTypes::PARTY_EXP_SHARE_ERROR);
break;
default:
- logger->log("QQQ Unknown party exp option: %d\n", exp);
+ UNIMPLIMENTEDPACKET;
break;
}
@@ -132,7 +133,7 @@ void PartyHandler::processPartySettingsContinue(const int16_t exp,
NotifyManager::notify(NotifyTypes::PARTY_ITEM_SHARE_ERROR);
break;
default:
- logger->log("QQQ Unknown party item option: %d\n", exp);
+ UNIMPLIMENTEDPACKET;
break;
}
}
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 24a1d95ec..12dec8c6c 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -67,7 +67,8 @@ class PartyHandler notfinal : public Net::PartyHandler
static void processPartyUpdateCoords(Net::MessageIn &msg);
- static void processPartySettingsContinue(const int16_t exp,
+ static void processPartySettingsContinue(Net::MessageIn &msg,
+ const int16_t exp,
const int16_t item);
static Net::PartyShare::Type mShareExp;
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index eb6f8d0af..c12dc081e 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -173,7 +173,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
return;
}
- playerHandler->setStat(type, value, -1, true);
+ playerHandler->setStat(msg, type, value, -1, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate1")
}
@@ -182,7 +182,7 @@ void PlayerHandler::processPlayerStatUpdate2(Net::MessageIn &msg)
BLOCK_START("PlayerHandler::processPlayerStatUpdate2")
const int type = msg.readInt16("type");
const int value = msg.readInt32("value");
- playerHandler->setStat(type, value, -1, true);
+ playerHandler->setStat(msg, type, value, -1, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate2")
}
@@ -193,7 +193,7 @@ void PlayerHandler::processPlayerStatUpdate3(Net::MessageIn &msg)
const int base = msg.readInt32("base");
const int bonus = msg.readInt32("bonus");
- playerHandler->setStat(type, base, bonus, false);
+ playerHandler->setStat(msg, type, base, bonus, false);
BLOCK_END("PlayerHandler::processPlayerStatUpdate3")
}
@@ -213,7 +213,7 @@ void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg)
NotifyManager::notify(NotifyTypes::SKILL_RAISE_ERROR);
}
- playerHandler->setStat(type, value, -1, true);
+ playerHandler->setStat(msg, type, value, -1, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate4")
}
@@ -223,7 +223,7 @@ void PlayerHandler::processPlayerStatUpdate6(Net::MessageIn &msg)
const int type = msg.readInt16("type");
const int value = msg.readUInt8("value");
if (statusWindow)
- playerHandler->setStat(type, value, -1, true);
+ playerHandler->setStat(msg, type, value, -1, true);
BLOCK_END("PlayerHandler::processPlayerStatUpdate6")
}
@@ -240,7 +240,7 @@ void PlayerHandler::processPlayerArrowMessage(Net::MessageIn &msg)
// arrows equiped
break;
default:
- logger->log("QQQQ 0x013b: Unhandled message %i", type);
+ UNIMPLIMENTEDPACKET;
break;
}
BLOCK_END("PlayerHandler::processPlayerArrowMessage")
@@ -256,7 +256,8 @@ bool PlayerHandler::canUseMagic() const
if (mod != -1) \
PlayerInfo::setStatMod(stat, mod)
-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
@@ -450,8 +451,7 @@ void PlayerHandler::setStat(const int type,
break;
default:
- logger->log("Error: Unknown stat set: %d, values: %d, %d",
- type, base, mod);
+ UNIMPLIMENTEDPACKET;
break;
}
}
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 6b5d0d0b8..b0d20be6e 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -53,7 +53,8 @@ class PlayerHandler notfinal : public Net::PlayerHandler
Vector getDefaultWalkSpeed() const override final A_WARN_UNUSED;
- void setStat(const int type,
+ void setStat(Net::MessageIn &msg,
+ const int type,
const int base,
const int mod,
const bool notify) const override;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-14 13:35:20 +0000