josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove 94567c94e6, instead don't check range/facing when finishing instant cast spells

Browse Source 
--HG--
branch : trunk
This commit is contained in:
thenecromancer
2010-03-07 14:32:53 +01:00
parent 34bc948f37
commit aeebe57dc0
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Spell.cpp
+6 -10
View File
@@ -2826,7 +2826,7 @@ void Spell::cast(bool skipCheck)
if(!m_IsTriggeredSpell || !skipCheck) if(!m_IsTriggeredSpell || !skipCheck)
{ {
SpellCastResult castResult = CheckCast(false); SpellCastResult castResult = CheckCast(false);
if(castResult != SPELL_CAST_OK && !(m_spellInfo->Attributes & SPELL_ATTR_ONLY_STEALTHED)) if(castResult != SPELL_CAST_OK)
{ {
SendCastResult(castResult); SendCastResult(castResult);
SendInterrupted(0); SendInterrupted(0);
@@ -5504,22 +5504,18 @@ bool Spell::CanAutoCast(Unit* target)
SpellCastResult Spell::CheckRange(bool strict) SpellCastResult Spell::CheckRange(bool strict)
{ {
//float range_mod;
// self cast doesn't need range checking -- also for Starshards fix // self cast doesn't need range checking -- also for Starshards fix
if (m_spellInfo->rangeIndex == 1) if (m_spellInfo->rangeIndex == 1)
return SPELL_CAST_OK; return SPELL_CAST_OK;
// i do not know why we need this // Don't check for instant cast spells
/*if (strict) //add radius of caster if (!strict && m_casttime == 0)
range_mod = 1.25; return SPELL_CAST_OK;
else //add radius of caster and ~5 yds "give"
range_mod = 6.25;*/
SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex); SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(m_spellInfo->rangeIndex);
Unit *target = m_targets.getUnitTarget(); Unit *target = m_targets.getUnitTarget();
float max_range = m_caster->GetSpellMaxRangeForTarget(target, srange); // + range_mod; float max_range = m_caster->GetSpellMaxRangeForTarget(target, srange);
float min_range = m_caster->GetSpellMinRangeForTarget(target, srange); float min_range = m_caster->GetSpellMinRangeForTarget(target, srange);
uint32 range_type = GetSpellRangeType(srange); uint32 range_type = GetSpellRangeType(srange);
@@ -5531,7 +5527,7 @@ SpellCastResult Spell::CheckRange(bool strict)
if(range_type == SPELL_RANGE_MELEE) if(range_type == SPELL_RANGE_MELEE)
{ {
// Because of lag, we can not check too strictly here. // Because of lag, we can not check too strictly here.
if(!m_caster->IsWithinMeleeRange(target, max_range/* - 2*MIN_MELEE_REACH*/)) if(!m_caster->IsWithinMeleeRange(target, max_range))
return SPELL_FAILED_OUT_OF_RANGE; return SPELL_FAILED_OUT_OF_RANGE;
} }
else if(!m_caster->IsWithinCombatRange(target, max_range)) else if(!m_caster->IsWithinCombatRange(target, max_range))