aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Handlers/InspectHandler.cpp6
-rw-r--r--src/server/game/Server/Packets/InspectPackets.cpp8
-rw-r--r--src/server/game/Server/Packets/InspectPackets.h8
3 files changed, 11 insertions, 11 deletions
diff --git a/src/server/game/Handlers/InspectHandler.cpp b/src/server/game/Handlers/InspectHandler.cpp
index 5bfd00dc1fa..472a3babafd 100644
--- a/src/server/game/Handlers/InspectHandler.cpp
+++ b/src/server/game/Handlers/InspectHandler.cpp
@@ -57,10 +57,10 @@ void WorldSession::HandleInspectOpcode(WorldPackets::Inspect::Inspect& inspect)
for (std::size_t i = 0; i < pvpTalents.size(); ++i)
inspectResult.PvpTalents[i] = pvpTalents[i];
- inspectResult.TalentTraits.Level = player->GetLevel();
- inspectResult.TalentTraits.ChrSpecializationID = AsUnderlyingType(player->GetPrimarySpecialization());
+ inspectResult.TraitsInfo.PlayerLevel = player->GetLevel();
+ inspectResult.TraitsInfo.SpecID = AsUnderlyingType(player->GetPrimarySpecialization());
if (UF::TraitConfig const* traitConfig = player->GetTraitConfig(player->m_activePlayerData->ActiveCombatTraitConfigID))
- inspectResult.TalentTraits.Config = WorldPackets::Traits::TraitConfig(*traitConfig);
+ inspectResult.TraitsInfo.ActiveCombatTraits = WorldPackets::Traits::TraitConfig(*traitConfig);
}
if (Guild* guild = sGuildMgr->GetGuildById(player->GetGuildId()))
diff --git a/src/server/game/Server/Packets/InspectPackets.cpp b/src/server/game/Server/Packets/InspectPackets.cpp
index 1e782426c92..ddebb53d225 100644
--- a/src/server/game/Server/Packets/InspectPackets.cpp
+++ b/src/server/game/Server/Packets/InspectPackets.cpp
@@ -150,9 +150,9 @@ ByteBuffer& operator<<(ByteBuffer& data, PVPBracketData const& bracket)
ByteBuffer& operator<<(ByteBuffer& data, TraitInspectInfo const& traits)
{
- data << int32(traits.Level);
- data << int32(traits.ChrSpecializationID);
- data << traits.Config;
+ data << int32(traits.PlayerLevel);
+ data << int32(traits.SpecID);
+ data << traits.ActiveCombatTraits;
return data;
}
@@ -238,7 +238,7 @@ WorldPacket const* InspectResult::Write()
if (AzeriteLevel)
_worldPacket << int32(*AzeriteLevel);
- _worldPacket << TalentTraits;
+ _worldPacket << TraitsInfo;
return &_worldPacket;
}
diff --git a/src/server/game/Server/Packets/InspectPackets.h b/src/server/game/Server/Packets/InspectPackets.h
index bd8c0703129..d78ffbe78da 100644
--- a/src/server/game/Server/Packets/InspectPackets.h
+++ b/src/server/game/Server/Packets/InspectPackets.h
@@ -120,9 +120,9 @@ namespace WorldPackets
struct TraitInspectInfo
{
- int32 Level = 0;
- int32 ChrSpecializationID = 0;
- Traits::TraitConfig Config;
+ int32 PlayerLevel = 0;
+ int32 SpecID = 0;
+ Traits::TraitConfig ActiveCombatTraits;
};
class InspectResult final : public ServerPacket
@@ -145,7 +145,7 @@ namespace WorldPackets
uint16 TodayHK = 0;
uint16 YesterdayHK = 0;
uint8 LifetimeMaxRank = 0;
- TraitInspectInfo TalentTraits;
+ TraitInspectInfo TraitsInfo;
};
class QueryInspectAchievements final : public ClientPacket