aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/server/game/Entities/Player/Player.cpp2
-rw-r--r--src/server/game/Server/Packets/NPCPackets.cpp6
-rw-r--r--src/server/game/Server/Packets/NPCPackets.h2
-rw-r--r--src/server/game/Server/Packets/SpellPackets.cpp20
-rw-r--r--src/server/game/Server/Packets/SpellPackets.h8
-rw-r--r--src/server/game/Server/Packets/TicketPackets.cpp89
-rw-r--r--src/server/game/Server/Packets/TicketPackets.h16
7 files changed, 71 insertions, 72 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 61ce645ba9d..9324fbc2a8f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -3226,7 +3226,7 @@ void Player::LearnSpell(uint32 spell_id, bool dependent, int32 fromSkill /*= 0*/
WorldPackets::Spells::LearnedSpells learnedSpells;
WorldPackets::Spells::LearnedSpellInfo& learnedSpellInfo = learnedSpells.ClientLearnedSpellData.emplace_back();
learnedSpellInfo.SpellID = spell_id;
- learnedSpellInfo.IsFavorite = favorite;
+ learnedSpellInfo.Favorite = favorite;
learnedSpellInfo.TraitDefinitionID = traitDefinitionId;
learnedSpells.SuppressMessaging = suppressMessaging;
SendDirectMessage(learnedSpells.Write());
diff --git a/src/server/game/Server/Packets/NPCPackets.cpp b/src/server/game/Server/Packets/NPCPackets.cpp
index fe1632b74fe..babeb6b2a1e 100644
--- a/src/server/game/Server/Packets/NPCPackets.cpp
+++ b/src/server/game/Server/Packets/NPCPackets.cpp
@@ -117,15 +117,15 @@ WorldPacket const* GossipMessage::Write()
_worldPacket << int32(FriendshipFactionID);
_worldPacket << uint32(GossipOptions.size());
_worldPacket << uint32(GossipText.size());
- _worldPacket << OptionalInit(TextID);
+ _worldPacket << OptionalInit(RandomTextID);
_worldPacket << OptionalInit(BroadcastTextID);
_worldPacket.FlushBits();
for (ClientGossipOptions const& options : GossipOptions)
_worldPacket << options;
- if (TextID)
- _worldPacket << int32(*TextID);
+ if (RandomTextID)
+ _worldPacket << int32(*RandomTextID);
if (BroadcastTextID)
_worldPacket << int32(*BroadcastTextID);
diff --git a/src/server/game/Server/Packets/NPCPackets.h b/src/server/game/Server/Packets/NPCPackets.h
index 2a9eb75a198..3a52d99c29f 100644
--- a/src/server/game/Server/Packets/NPCPackets.h
+++ b/src/server/game/Server/Packets/NPCPackets.h
@@ -120,7 +120,7 @@ namespace WorldPackets
int32 FriendshipFactionID = 0;
ObjectGuid GossipGUID;
std::vector<ClientGossipText> GossipText;
- Optional<int32> TextID; // in classic variants this still holds npc_text id
+ Optional<int32> RandomTextID; // in classic variants this still holds npc_text id
Optional<int32> BroadcastTextID;
int32 GossipID = 0;
int32 LfgDungeonsID = 0;
diff --git a/src/server/game/Server/Packets/SpellPackets.cpp b/src/server/game/Server/Packets/SpellPackets.cpp
index 91da419d9b1..fd82be2f14f 100644
--- a/src/server/game/Server/Packets/SpellPackets.cpp
+++ b/src/server/game/Server/Packets/SpellPackets.cpp
@@ -451,14 +451,14 @@ WorldPacket const* SpellGo::Write()
ByteBuffer& operator<<(ByteBuffer& data, LearnedSpellInfo const& learnedSpellInfo)
{
data << int32(learnedSpellInfo.SpellID);
- data.WriteBit(learnedSpellInfo.IsFavorite);
- data.WriteBit(learnedSpellInfo.field_8.has_value());
+ data.WriteBit(learnedSpellInfo.Favorite);
+ data.WriteBit(learnedSpellInfo.EquipableSpellInvSlot.has_value());
data.WriteBit(learnedSpellInfo.Superceded.has_value());
data.WriteBit(learnedSpellInfo.TraitDefinitionID.has_value());
data.FlushBits();
- if (learnedSpellInfo.field_8)
- data << int32(*learnedSpellInfo.field_8);
+ if (learnedSpellInfo.EquipableSpellInvSlot)
+ data << int32(*learnedSpellInfo.EquipableSpellInvSlot);
if (learnedSpellInfo.Superceded)
data << int32(*learnedSpellInfo.Superceded);
@@ -645,13 +645,13 @@ ByteBuffer& operator<<(ByteBuffer& data, SpellHistoryEntry const& historyEntry)
data << int32(historyEntry.RecoveryTime);
data << int32(historyEntry.CategoryRecoveryTime);
data << float(historyEntry.ModRate);
- data.WriteBit(historyEntry.unused622_1.has_value());
- data.WriteBit(historyEntry.unused622_2.has_value());
+ data.WriteBit(historyEntry.RecoveryTimeStartOffset.has_value());
+ data.WriteBit(historyEntry.CategoryRecoveryTimeStartOffset.has_value());
data.WriteBit(historyEntry.OnHold);
- if (historyEntry.unused622_1)
- data << uint32(*historyEntry.unused622_1);
- if (historyEntry.unused622_2)
- data << uint32(*historyEntry.unused622_2);
+ if (historyEntry.RecoveryTimeStartOffset)
+ data << uint32(*historyEntry.RecoveryTimeStartOffset);
+ if (historyEntry.CategoryRecoveryTimeStartOffset)
+ data << uint32(*historyEntry.CategoryRecoveryTimeStartOffset);
data.FlushBits();
return data;
diff --git a/src/server/game/Server/Packets/SpellPackets.h b/src/server/game/Server/Packets/SpellPackets.h
index 911afecfd4f..383c2b13445 100644
--- a/src/server/game/Server/Packets/SpellPackets.h
+++ b/src/server/game/Server/Packets/SpellPackets.h
@@ -399,8 +399,8 @@ namespace WorldPackets
struct LearnedSpellInfo
{
int32 SpellID = 0;
- bool IsFavorite = false;
- Optional<int32> field_8;
+ bool Favorite = false;
+ Optional<int32> EquipableSpellInvSlot;
Optional<int32> Superceded;
Optional<int32> TraitDefinitionID;
};
@@ -596,8 +596,8 @@ namespace WorldPackets
int32 CategoryRecoveryTime = 0;
float ModRate = 1.0f;
bool OnHold = false;
- Optional<uint32> unused622_1; ///< This field is not used for anything in the client in 6.2.2.20444
- Optional<uint32> unused622_2; ///< This field is not used for anything in the client in 6.2.2.20444
+ Optional<int32> RecoveryTimeStartOffset;
+ Optional<int32> CategoryRecoveryTimeStartOffset;
};
class SendSpellHistory final : public ServerPacket
diff --git a/src/server/game/Server/Packets/TicketPackets.cpp b/src/server/game/Server/Packets/TicketPackets.cpp
index 1d133113d10..f13d1c2eb50 100644
--- a/src/server/game/Server/Packets/TicketPackets.cpp
+++ b/src/server/game/Server/Packets/TicketPackets.cpp
@@ -19,7 +19,9 @@
#include "PacketUtilities.h"
#include "SupportMgr.h"
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketHeader& header)
+namespace WorldPackets::Ticket
+{
+ByteBuffer& operator>>(ByteBuffer& data, SupportTicketHeader& header)
{
data >> header.MapID;
data >> header.Position;
@@ -29,14 +31,14 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketHead
return data;
}
-WorldPacket const* WorldPackets::Ticket::GMTicketSystemStatus::Write()
+WorldPacket const* GMTicketSystemStatus::Write()
{
_worldPacket << int32(Status);
return &_worldPacket;
}
-WorldPacket const* WorldPackets::Ticket::GMTicketCaseStatus::Write()
+WorldPacket const* GMTicketCaseStatus::Write()
{
_worldPacket << int32(Cases.size());
@@ -60,12 +62,12 @@ WorldPacket const* WorldPackets::Ticket::GMTicketCaseStatus::Write()
return &_worldPacket;
}
-void WorldPackets::Ticket::GMTicketAcknowledgeSurvey::Read()
+void GMTicketAcknowledgeSurvey::Read()
{
_worldPacket >> CaseID;
}
-void WorldPackets::Ticket::SubmitUserFeedback::Read()
+void SubmitUserFeedback::Read()
{
_worldPacket >> Header;
uint32 noteLength = _worldPacket.ReadBits(24);
@@ -77,11 +79,11 @@ void WorldPackets::Ticket::SubmitUserFeedback::Read()
}
}
-WorldPackets::Ticket::SupportTicketChatLine::SupportTicketChatLine(time_t timestamp, std::string const& text) :
+SupportTicketChatLine::SupportTicketChatLine(time_t timestamp, std::string const& text) :
Timestamp(timestamp), Text(text)
{ }
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketChatLine& line)
+ByteBuffer& operator>>(ByteBuffer& data, SupportTicketChatLine& line)
{
data >> line.Timestamp;
line.Text = data.ReadString(data.ReadBits(12));
@@ -89,12 +91,12 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketChat
return data;
}
-WorldPackets::Ticket::SupportTicketChatLine::SupportTicketChatLine(ByteBuffer& data)
+SupportTicketChatLine::SupportTicketChatLine(ByteBuffer& data)
{
data >> *this;
}
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketChatLog& chatlog)
+ByteBuffer& operator>>(ByteBuffer& data, SupportTicketChatLog& chatlog)
{
uint32 linesCount = data.read<uint32>();
bool hasReportLineIndex = data.ReadBit();
@@ -109,48 +111,44 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketChat
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketHorusChatLine& line)
+ByteBuffer& operator>>(ByteBuffer& data, SupportTicketHorusChatLine& line)
{
data >> line.Timestamp;
- data >> line.AuthorGUID;
+ data >> line.PlayerGuid;
- bool hasClubID = data.ReadBit();
- bool hasChannelGUID = data.ReadBit();
- bool hasRealmAddress = data.ReadBit();
- bool hasSlashCmd = data.ReadBit();
+ data >> OptionalInit(line.ClubID);
+ data >> OptionalInit(line.ChannelGuid);
+ data >> OptionalInit(line.WorldServer);
+ data >> OptionalInit(line.Cmd);
uint32 textLength = data.ReadBits(12);
- if (hasClubID)
- line.ClubID = data.read<uint64>();
+ if (line.ClubID)
+ data >> *line.ClubID;
- if (hasChannelGUID)
- {
- line.ChannelGUID.emplace();
- data >> *line.ChannelGUID;
- }
+ if (line.ChannelGuid)
+ data >> *line.ChannelGuid;
- if (hasRealmAddress)
+ if (line.WorldServer)
{
- line.RealmAddress.emplace();
- data >> line.RealmAddress->VirtualRealmAddress;
- data >> line.RealmAddress->field_4;
- data >> line.RealmAddress->field_6;
+ data >> line.WorldServer->Realm;
+ data >> line.WorldServer->Server;
+ data >> line.WorldServer->Type;
}
- if (hasSlashCmd)
- line.SlashCmd = data.read<int32>();
+ if (line.Cmd)
+ data >> *line.Cmd;
line.Text = data.ReadString(textLength);
return data;
}
-WorldPackets::Ticket::SupportTicketHorusChatLine::SupportTicketHorusChatLine(ByteBuffer& data)
+SupportTicketHorusChatLine::SupportTicketHorusChatLine(ByteBuffer& data)
{
data >> *this;
}
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketHorusChatLog& chatlog)
+ByteBuffer& operator>>(ByteBuffer& data, SupportTicketHorusChatLog& chatlog)
{
uint32 linesCount = data.read<uint32>();
data.ResetBitPos();
@@ -161,7 +159,7 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::SupportTicketHoru
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketMailInfo>& mail)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketMailInfo>& mail)
{
mail.emplace();
@@ -174,7 +172,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketCalendarEventInfo>& event)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketCalendarEventInfo>& event)
{
event.emplace();
@@ -185,7 +183,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketPetInfo>& pet)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketPetInfo>& pet)
{
pet.emplace();
@@ -195,7 +193,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketGuildInfo>& guild)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketGuildInfo>& guild)
{
guild.emplace();
@@ -206,7 +204,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketLFGListEntryInfo>& lfgListSearchResult)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketLFGListEntryInfo>& lfgListSearchResult)
{
lfgListSearchResult.emplace();
@@ -230,7 +228,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketLFGListApplicant>& lfgListApplicant)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketLFGListApplicant>& lfgListApplicant)
{
lfgListApplicant.emplace();
@@ -240,7 +238,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketClubFinderInfo>& clubInfo)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketClubFinderInfo>& clubInfo)
{
clubInfo.emplace();
@@ -252,7 +250,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportTicketArenaTeamInfo>& arenaTeam)
+ByteBuffer& operator>>(ByteBuffer& data, Optional<SupportTicketArenaTeamInfo>& arenaTeam)
{
arenaTeam.emplace();
@@ -263,7 +261,7 @@ ByteBuffer& operator>>(ByteBuffer& data, Optional<WorldPackets::Ticket::SupportT
return data;
}
-void WorldPackets::Ticket::SupportTicketSubmitComplaint::Read()
+void SupportTicketSubmitComplaint::Read()
{
_worldPacket >> Header;
_worldPacket >> TargetCharacterGUID;
@@ -321,7 +319,7 @@ void WorldPackets::Ticket::SupportTicketSubmitComplaint::Read()
_worldPacket >> ArenaTeamInfo;
}
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::Complaint::ComplaintOffender& complaintOffender)
+ByteBuffer& operator>>(ByteBuffer& data, Complaint::ComplaintOffender& complaintOffender)
{
data >> complaintOffender.PlayerGuid;
data >> complaintOffender.RealmAddress;
@@ -330,7 +328,7 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::Complaint::Compla
return data;
}
-ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::Complaint::ComplaintChat& chat)
+ByteBuffer& operator>>(ByteBuffer& data, Complaint::ComplaintChat& chat)
{
data >> chat.Command;
data >> chat.ChannelID;
@@ -339,7 +337,7 @@ ByteBuffer& operator>>(ByteBuffer& data, WorldPackets::Ticket::Complaint::Compla
return data;
}
-void WorldPackets::Ticket::Complaint::Read()
+void Complaint::Read()
{
_worldPacket >> ComplaintType;
_worldPacket >> Offender;
@@ -361,7 +359,7 @@ void WorldPackets::Ticket::Complaint::Read()
}
}
-WorldPacket const* WorldPackets::Ticket::ComplaintResult::Write()
+WorldPacket const* ComplaintResult::Write()
{
_worldPacket << uint32(ComplaintType);
_worldPacket << uint8(Result);
@@ -369,7 +367,7 @@ WorldPacket const* WorldPackets::Ticket::ComplaintResult::Write()
return &_worldPacket;
}
-void WorldPackets::Ticket::BugReport::Read()
+void BugReport::Read()
{
Type = _worldPacket.ReadBit();
uint32 diagLen = _worldPacket.ReadBits(12);
@@ -377,3 +375,4 @@ void WorldPackets::Ticket::BugReport::Read()
DiagInfo = _worldPacket.ReadString(diagLen);
Text = _worldPacket.ReadString(textLen);
}
+}
diff --git a/src/server/game/Server/Packets/TicketPackets.h b/src/server/game/Server/Packets/TicketPackets.h
index 1e0bd625137..815539e981f 100644
--- a/src/server/game/Server/Packets/TicketPackets.h
+++ b/src/server/game/Server/Packets/TicketPackets.h
@@ -124,19 +124,19 @@ namespace WorldPackets
{
SupportTicketHorusChatLine(ByteBuffer& data);
- struct SenderRealm
+ struct ServerSpec
{
- uint32 VirtualRealmAddress;
- uint16 field_4;
- uint8 field_6;
+ uint32 Realm;
+ uint16 Server;
+ uint8 Type;
};
WorldPackets::Timestamp<> Timestamp;
- ObjectGuid AuthorGUID;
+ ObjectGuid PlayerGuid;
Optional<uint64> ClubID;
- Optional<ObjectGuid> ChannelGUID;
- Optional<SenderRealm> RealmAddress;
- Optional<int32> SlashCmd;
+ Optional<ObjectGuid> ChannelGuid;
+ Optional<ServerSpec> WorldServer;
+ Optional<int32> Cmd;
std::string Text;
};