mirror of
https://github.com/Kelsidavis/WoWee.git
synced 2026-03-24 00:00:13 +00:00
game: fix Classic/TBC SMSG_TEXT_EMOTE field order
Classic 1.12 and TBC 2.4.3 send SMSG_TEXT_EMOTE with the field order: textEmoteId(u32) + emoteNum(u32) + senderGuid(u64) + nameLen(u32) + name WotLK 3.3.5a swapped senderGuid to the front: senderGuid(u64) + textEmoteId(u32) + emoteNum(u32) + nameLen(u32) + name The previous TextEmoteParser always used the WotLK order, causing senderGuid to be read as a mashup of textEmoteId+emoteNum for Classic/TBC. Emote animations and chat entries were associated with wrong GUIDs. TextEmoteParser::parse now takes a legacyFormat parameter; handleTextEmote passes it based on expansion detection.
This commit is contained in:
parent
a0979b9cd8
commit
c19edd407a
3 changed files with 22 additions and 7 deletions
|
|
@ -8560,8 +8560,11 @@ void GameHandler::sendTextEmote(uint32_t textEmoteId, uint64_t targetGuid) {
|
|||
}
|
||||
|
||||
void GameHandler::handleTextEmote(network::Packet& packet) {
|
||||
// Classic 1.12 and TBC 2.4.3 send: textEmoteId(u32) + emoteNum(u32) + senderGuid(u64) + nameLen(u32) + name
|
||||
// WotLK 3.3.5a reversed this to: senderGuid(u64) + textEmoteId(u32) + emoteNum(u32) + nameLen(u32) + name
|
||||
const bool legacyFormat = isClassicLikeExpansion() || isActiveExpansion("tbc");
|
||||
TextEmoteData data;
|
||||
if (!TextEmoteParser::parse(packet, data)) {
|
||||
if (!TextEmoteParser::parse(packet, data, legacyFormat)) {
|
||||
LOG_WARNING("Failed to parse SMSG_TEXT_EMOTE");
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue