From 19990a966b7e9c0b3382509b01d9af47501547e1 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 5 Jun 2021 13:16:54 +0200 Subject: [PATCH] Core/PacketIO: Named PVPInfo/bracket fields --- .../Entities/Object/Updates/UpdateFields.cpp | 42 +++++++++---------- .../Entities/Object/Updates/UpdateFields.h | 14 +++---- .../Server/Packets/BattlegroundPackets.cpp | 2 +- .../game/Server/Packets/BattlegroundPackets.h | 2 +- .../game/Server/Packets/InspectPackets.cpp | 6 +-- .../game/Server/Packets/InspectPackets.h | 6 +-- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.cpp b/src/server/game/Entities/Object/Updates/UpdateFields.cpp index 2d210afde5..316927af52 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.cpp +++ b/src/server/game/Entities/Object/Updates/UpdateFields.cpp @@ -2547,15 +2547,15 @@ void RestInfo::ClearChangesMask() void PVPInfo::WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const { - data << uint32(Field_0); - data << uint32(Field_4); - data << uint32(Field_8); - data << uint32(Field_C); + data << uint32(WeeklyPlayed); + data << uint32(WeeklyWon); + data << uint32(SeasonPlayed); + data << uint32(SeasonWon); data << uint32(Rating); - data << uint32(Field_14); - data << uint32(Field_18); + data << uint32(WeeklyBestRating); + data << uint32(SeasonBestRating); data << uint32(PvpTierID); - data.WriteBit(Field_20); + data.WriteBit(Disqualified); data.FlushBits(); } @@ -2571,7 +2571,7 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const { if (changesMask[1]) { - data.WriteBit(Field_20); + data.WriteBit(Disqualified); } } data.FlushBits(); @@ -2579,19 +2579,19 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const { if (changesMask[2]) { - data << uint32(Field_0); + data << uint32(WeeklyPlayed); } if (changesMask[3]) { - data << uint32(Field_4); + data << uint32(WeeklyWon); } if (changesMask[4]) { - data << uint32(Field_8); + data << uint32(SeasonPlayed); } if (changesMask[5]) { - data << uint32(Field_C); + data << uint32(SeasonWon); } if (changesMask[6]) { @@ -2599,11 +2599,11 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const } if (changesMask[7]) { - data << uint32(Field_14); + data << uint32(WeeklyBestRating); } if (changesMask[8]) { - data << uint32(Field_18); + data << uint32(SeasonBestRating); } if (changesMask[9]) { @@ -2615,14 +2615,14 @@ void PVPInfo::WriteUpdate(ByteBuffer& data, bool ignoreChangesMask, Player const void PVPInfo::ClearChangesMask() { - Base::ClearChangesMask(Field_20); - Base::ClearChangesMask(Field_0); - Base::ClearChangesMask(Field_4); - Base::ClearChangesMask(Field_8); - Base::ClearChangesMask(Field_C); + Base::ClearChangesMask(Disqualified); + Base::ClearChangesMask(WeeklyPlayed); + Base::ClearChangesMask(WeeklyWon); + Base::ClearChangesMask(SeasonPlayed); + Base::ClearChangesMask(SeasonWon); Base::ClearChangesMask(Rating); - Base::ClearChangesMask(Field_14); - Base::ClearChangesMask(Field_18); + Base::ClearChangesMask(WeeklyBestRating); + Base::ClearChangesMask(SeasonBestRating); Base::ClearChangesMask(PvpTierID); _changesMask.ResetAll(); } diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.h b/src/server/game/Entities/Object/Updates/UpdateFields.h index 7b450dac5f..d65234a228 100644 --- a/src/server/game/Entities/Object/Updates/UpdateFields.h +++ b/src/server/game/Entities/Object/Updates/UpdateFields.h @@ -522,14 +522,14 @@ struct RestInfo : public IsUpdateFieldStructureTag, public HasChangesMask<3> struct PVPInfo : public IsUpdateFieldStructureTag, public HasChangesMask<10> { - UpdateField Field_20; - UpdateField Field_0; - UpdateField Field_4; - UpdateField Field_8; - UpdateField Field_C; + UpdateField Disqualified; + UpdateField WeeklyPlayed; + UpdateField WeeklyWon; + UpdateField SeasonPlayed; + UpdateField SeasonWon; UpdateField Rating; - UpdateField Field_14; - UpdateField Field_18; + UpdateField WeeklyBestRating; + UpdateField SeasonBestRating; UpdateField PvpTierID; void WriteCreate(ByteBuffer& data, Player const* owner, Player const* receiver) const; diff --git a/src/server/game/Server/Packets/BattlegroundPackets.cpp b/src/server/game/Server/Packets/BattlegroundPackets.cpp index bd1ad34379..5ee8725465 100644 --- a/src/server/game/Server/Packets/BattlegroundPackets.cpp +++ b/src/server/game/Server/Packets/BattlegroundPackets.cpp @@ -325,7 +325,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::RatedPvpInf data << int32(bracketInfo.BestSeasonRating); data << int32(bracketInfo.PvpTierID); data << int32(bracketInfo.Unused3); - data.WriteBit(bracketInfo.Unused4); + data.WriteBit(bracketInfo.Disqualified); data.FlushBits(); return data; diff --git a/src/server/game/Server/Packets/BattlegroundPackets.h b/src/server/game/Server/Packets/BattlegroundPackets.h index e469cad97c..b145cfbe47 100644 --- a/src/server/game/Server/Packets/BattlegroundPackets.h +++ b/src/server/game/Server/Packets/BattlegroundPackets.h @@ -448,7 +448,7 @@ namespace WorldPackets int32 BestSeasonRating = 0; int32 PvpTierID = 0; int32 Unused3 = 0; - bool Unused4 = false; + bool Disqualified = false; } Bracket[6]; }; diff --git a/src/server/game/Server/Packets/InspectPackets.cpp b/src/server/game/Server/Packets/InspectPackets.cpp index 7143abbf65..0a2746dc44 100644 --- a/src/server/game/Server/Packets/InspectPackets.cpp +++ b/src/server/game/Server/Packets/InspectPackets.cpp @@ -129,9 +129,9 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Inspect::PVPBracketData c data << int32(bracket.SeasonPlayed); data << int32(bracket.SeasonWon); data << int32(bracket.WeeklyBestRating); - data << int32(bracket.Unk710); - data << int32(bracket.Unk801_1); - data.WriteBit(bracket.Unk801_2); + data << int32(bracket.SeasonBestRating); + data << int32(bracket.PvpTierID); + data.WriteBit(bracket.Disqualified); data.FlushBits(); return data; diff --git a/src/server/game/Server/Packets/InspectPackets.h b/src/server/game/Server/Packets/InspectPackets.h index 91e8e69afc..7867695909 100644 --- a/src/server/game/Server/Packets/InspectPackets.h +++ b/src/server/game/Server/Packets/InspectPackets.h @@ -102,10 +102,10 @@ namespace WorldPackets int32 SeasonPlayed = 0; int32 SeasonWon = 0; int32 WeeklyBestRating = 0; - int32 Unk710 = 0; - int32 Unk801_1 = 0; + int32 SeasonBestRating = 0; + int32 PvpTierID = 0; uint8 Bracket = 0; - bool Unk801_2 = false; + bool Disqualified = false; }; class InspectResult final : public ServerPacket