From 68faf5bc4bc69a111eca479860215f075adcdad6 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 26 Jun 2020 23:28:33 +0200 Subject: Core/Common: Replace ASSERT(false, "...") with ABORT_MSG("...") (cherry picked from commit 54c701cf0db81c0062e8c5020e07db18984d0ffa) --- src/server/game/Spells/Spell.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/server/game/Spells/Spell.cpp') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index fa5f19f1ff5..9e1158407f0 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -902,7 +902,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo, m_targets.SetSrc(*m_caster); break; default: - ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_SRC"); + ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_SRC"); break; } break; @@ -919,7 +919,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo, SelectImplicitDestDestTargets(spellEffectInfo, targetType); break; default: - ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_DEST"); + ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT_DEST"); break; } break; @@ -933,7 +933,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo, SelectImplicitTargetObjectTargets(spellEffectInfo, targetType); break; default: - ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT"); + ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target reference type for TARGET_TYPE_OBJECT"); break; } break; @@ -943,7 +943,7 @@ void Spell::SelectEffectImplicitTargets(SpellEffectInfo const& spellEffectInfo, TC_LOG_DEBUG("spells", "SPELL: target type %u, found in spellID %u, effect %u is not implemented yet!", m_spellInfo->Id, uint32(spellEffectInfo.EffectIndex), targetType.GetTarget()); break; default: - ASSERT(false && "Spell::SelectEffectImplicitTargets: received not implemented select target category"); + ABORT_MSG("Spell::SelectEffectImplicitTargets: received not implemented select target category"); break; } } @@ -952,7 +952,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffectInfo const& spellEffectInfo, { if (targetType.GetReferenceType() != TARGET_REFERENCE_TYPE_CASTER) { - ASSERT(false && "Spell::SelectImplicitChannelTargets: received not implemented target reference type"); + ABORT_MSG("Spell::SelectImplicitChannelTargets: received not implemented target reference type"); return; } @@ -1008,7 +1008,7 @@ void Spell::SelectImplicitChannelTargets(SpellEffectInfo const& spellEffectInfo, break; } default: - ASSERT(false && "Spell::SelectImplicitChannelTargets: received not implemented target type"); + ABORT_MSG("Spell::SelectImplicitChannelTargets: received not implemented target type"); break; } } @@ -1017,7 +1017,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffectInfo const& spellEffectInfo, { if (targetType.GetReferenceType() != TARGET_REFERENCE_TYPE_CASTER) { - ASSERT(false && "Spell::SelectImplicitNearbyTargets: received not implemented target reference type"); + ABORT_MSG("Spell::SelectImplicitNearbyTargets: received not implemented target reference type"); return; } @@ -1038,7 +1038,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffectInfo const& spellEffectInfo, range = m_spellInfo->GetMaxRange(IsPositive(), m_caster, this); break; default: - ASSERT(false && "Spell::SelectImplicitNearbyTargets: received not implemented selection check type"); + ABORT_MSG("Spell::SelectImplicitNearbyTargets: received not implemented selection check type"); break; } @@ -1135,7 +1135,7 @@ void Spell::SelectImplicitNearbyTargets(SpellEffectInfo const& spellEffectInfo, break; } default: - ASSERT(false && "Spell::SelectImplicitNearbyTargets: received not implemented target object type"); + ABORT_MSG("Spell::SelectImplicitNearbyTargets: received not implemented target object type"); break; } @@ -1228,7 +1228,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffectInfo const& spellEffectInfo, Sp break; } default: - ASSERT(false && "Spell::SelectImplicitAreaTargets: received not implemented target reference type"); + ABORT_MSG("Spell::SelectImplicitAreaTargets: received not implemented target reference type"); return; } @@ -1250,7 +1250,7 @@ void Spell::SelectImplicitAreaTargets(SpellEffectInfo const& spellEffectInfo, Sp center = referer; break; default: - ASSERT(false && "Spell::SelectImplicitAreaTargets: received not implemented target reference type"); + ABORT_MSG("Spell::SelectImplicitAreaTargets: received not implemented target reference type"); return; } @@ -1784,7 +1784,7 @@ void Spell::SelectImplicitLineTargets(SpellEffectInfo const& spellEffectInfo, Sp dst = m_targets.GetUnitTarget(); break; default: - ASSERT(false, "Spell::SelectImplicitLineTargets: received not implemented target reference type"); + ABORT_MSG("Spell::SelectImplicitLineTargets: received not implemented target reference type"); return; } -- cgit v1.2.3