diff options
| author | Vincent-Michael <vincent_michael@gmx.de> | 2016-04-13 19:29:36 +0200 |
|---|---|---|
| committer | Vincent-Michael <vincent_michael@gmx.de> | 2016-04-13 19:29:36 +0200 |
| commit | 1c7515524d9a4f85faa0109f07e832dde0989856 (patch) | |
| tree | c0a9859282839f98e2d56610cb523946b336b2bc | |
| parent | d16314e6006912d8ffacf0245f5a81265eba620a (diff) | |
Core/Pets: Fixed issues reported by static analysis
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/PetPackets.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/Packets/PetPackets.h | 2 |
3 files changed, 3 insertions, 3 deletions
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; |