From 1c7515524d9a4f85faa0109f07e832dde0989856 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Wed, 13 Apr 2016 19:29:36 +0200 Subject: Core/Pets: Fixed issues reported by static analysis --- src/server/game/Entities/Player/Player.cpp | 2 +- src/server/game/Server/Packets/PetPackets.cpp | 2 +- src/server/game/Server/Packets/PetPackets.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c78fab43556..a74334621a3 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -20154,7 +20154,7 @@ void Player::PetSpellInitialize() WorldPackets::Pet::PetSpells petSpellsPacket; petSpellsPacket.PetGUID = pet->GetGUID(); - petSpellsPacket.CreatureFamily = pet->GetCreatureTemplate()->family; // creature family (required for pet talents) + petSpellsPacket._CreatureFamily = pet->GetCreatureTemplate()->family; // creature family (required for pet talents) //petSpellsPacket.Specialization = pet->GetSpecialization(); NYI petSpellsPacket.TimeLimit = pet->GetDuration(); petSpellsPacket.ReactState = pet->GetReactState(); diff --git a/src/server/game/Server/Packets/PetPackets.cpp b/src/server/game/Server/Packets/PetPackets.cpp index b46b71527d6..cc58360caff 100644 --- a/src/server/game/Server/Packets/PetPackets.cpp +++ b/src/server/game/Server/Packets/PetPackets.cpp @@ -20,7 +20,7 @@ WorldPacket const* WorldPackets::Pet::PetSpells::Write() { _worldPacket << PetGUID; - _worldPacket << int16(CreatureFamily); + _worldPacket << int16(_CreatureFamily); _worldPacket << int16(Specialization); _worldPacket << int32(TimeLimit); diff --git a/src/server/game/Server/Packets/PetPackets.h b/src/server/game/Server/Packets/PetPackets.h index 25764444a4b..b857e80f3cb 100644 --- a/src/server/game/Server/Packets/PetPackets.h +++ b/src/server/game/Server/Packets/PetPackets.h @@ -101,7 +101,7 @@ namespace WorldPackets WorldPacket const* Write() override; ObjectGuid PetGUID; - uint16 CreatureFamily = 0; + uint16 _CreatureFamily = 0; ///< @see enum CreatureFamily uint16 Specialization = 0; uint32 TimeLimit = 0; uint8 ReactState = 0; -- cgit v1.2.3