diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-04-04 12:44:56 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2015-04-04 12:44:56 +0200 |
| commit | 25e86f75f82c40eeba5ea4341b43bb0e30051368 (patch) | |
| tree | 6ab5971a23d1458d0c6ee2087dd183f375f3cd47 /src/server | |
| parent | 1a2c20f95d6479742af819b11923abe6b36ff6f6 (diff) | |
Core/Misc: Fix issues reported by static analysis
Coverity defect IDs: 1292760, 1292761, 1292762, 1292771, 1292770
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index b367ebe6a8a..cf0579200f7 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2213,12 +2213,7 @@ void Creature::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs continue; uint32 unSpellId = m_spells[i]; - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(unSpellId); - if (!spellInfo) - { - ASSERT(spellInfo); - continue; - } + SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(unSpellId); // Not send cooldown for this spells if (spellInfo->IsCooldownStartedOnEvent()) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 9e92492d46b..60cadab39fd 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -21532,12 +21532,7 @@ void Player::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) if (itr->second->state == PLAYERSPELL_REMOVED) continue; uint32 unSpellId = itr->first; - SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(unSpellId); - if (!spellInfo) - { - ASSERT(spellInfo); - continue; - } + SpellInfo const* spellInfo = sSpellMgr->EnsureSpellInfo(unSpellId); // Not send cooldown for this spells if (spellInfo->IsCooldownStartedOnEvent()) |