diff options
| author | jackpoz <giacomopoz@gmail.com> | 2017-12-08 17:33:10 +0100 |
|---|---|---|
| committer | funjoker <funjoker109@gmail.com> | 2021-02-25 18:50:55 +0100 |
| commit | a01d397c3d345aa1937bc929b72e41673f327209 (patch) | |
| tree | 51074224df377b1dcbc3d86c14ee61aff67b14af /src/server/game/Entities | |
| parent | 668a3ad643d926f717840398421992c9cd21ca5a (diff) | |
Core/Misc: Fix static analysis issues
Fix static analysis issues reported by 3rd party tools
(cherry picked from commit 24e82fe83d384e3a4cf17719e728760053516607)
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index e413f81f430..4a439c822f0 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -538,7 +538,7 @@ bool Creature::InitEntry(uint32 entry, CreatureData const* data /*= nullptr*/) // Load creature equipment if (!data || data->equipmentId == 0) LoadEquipment(); // use default equipment (if available) - else if (data && data->equipmentId != 0) // override, 0 means no equipment + else // override, 0 means no equipment { m_originalEquipmentId = data->equipmentId; LoadEquipment(data->equipmentId); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1453217b917..a427cec796a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3285,7 +3285,7 @@ void Player::RemoveSpell(uint32 spell_id, bool disabled /*= false*/, bool learn_ } // now re-learn if need re-activate - if (cur_active && !prev_itr->second->active && learn_low_rank) + if (!prev_itr->second->active && learn_low_rank) { if (AddSpell(prev_id, true, false, prev_itr->second->dependent, prev_itr->second->disabled)) { @@ -13751,7 +13751,7 @@ void Player::SwapItem(uint16 src, uint16 dst) } } - if (!released && IsBagPos(dst) && pDstItem) + if (!released && IsBagPos(dst)) { Bag* bag = pDstItem->ToBag(); for (uint32 i = 0; i < bag->GetBagSize(); ++i) @@ -14179,7 +14179,7 @@ void Player::AddEnchantmentDuration(Item* item, EnchantmentSlot slot, uint32 dur break; } } - if (item && duration > 0) + if (duration > 0) { GetSession()->SendItemEnchantTimeUpdate(GetGUID(), item->GetGUID(), slot, uint32(duration/1000)); m_enchantDuration.push_back(EnchantDuration(item, slot, duration)); @@ -18298,7 +18298,7 @@ bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) RelocateToHomebind(); } // Player was saved in Arena or Bg - else if (mapEntry && mapEntry->IsBattlegroundOrArena()) + else if (mapEntry->IsBattlegroundOrArena()) { Battleground* currentBg = nullptr; if (m_bgData.bgInstanceID) //saved in Battleground @@ -21986,7 +21986,7 @@ Pet* Player::GetPet() const if (!pet) return nullptr; - if (IsInWorld() && pet) + if (IsInWorld()) return pet; // there may be a guardian in this slot |