aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Spells
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2021-06-20 13:11:53 +0200
committerjackpoz <giacomopoz@gmail.com>2021-06-20 13:11:53 +0200
commit33dace231c5a169375523ffa89a2cc3fa48737bd (patch)
treee8023841a9c396371bcd636c67805f3920be354a /src/server/game/Spells
parent5446209b89146fdbe01627e806f7beddd6ae5de8 (diff)
Core/Misc: Fix issues reported by static analysis
Diffstat (limited to 'src/server/game/Spells')
-rw-r--r--src/server/game/Spells/Spell.cpp2
-rw-r--r--src/server/game/Spells/SpellEffects.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index b95ce469b08..1847ddaf111 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4993,7 +4993,7 @@ void Spell::TakeReagents()
for (int s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s)
{
// CastItem will be used up and does not count as reagent
- int32 charges = m_CastItem->GetSpellCharges(s);
+ int32 charges = ASSERT_NOTNULL(m_CastItem)->GetSpellCharges(s);
if (castItemTemplate->Spells[s].SpellCharges < 0 && abs(charges) < 2)
{
++itemcount;
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 23af38a2a4d..e3128e89115 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -970,6 +970,7 @@ void Spell::EffectTriggerRitualOfSummoning(SpellEffIndex effIndex)
void Spell::CalculateJumpSpeeds(SpellInfo const* spellInfo, uint8 i, float dist, float& speedXY, float& speedZ)
{
Unit* unitCaster = GetUnitCasterForEffectHandlers();
+ ASSERT(unitCaster);
float runSpeed = unitCaster->IsControlledByPlayer() ? playerBaseMoveSpeed[MOVE_RUN] : baseMoveSpeed[MOVE_RUN];
if (Creature* creature = unitCaster->ToCreature())
runSpeed *= creature->GetCreatureTemplate()->speed_run;