From 5d0f5f542109e2fbc13e21d12f2f44faa1b747de Mon Sep 17 00:00:00 2001 From: ApoC Date: Mon, 29 Jun 2009 01:10:26 +0200 Subject: [PATCH] [8088] Fixed min_range checking for spell casts. Skip in check values 0.0f from DBC, this spells do not have min range limitation. This should fix some inappropriate target too close messages. Signed-off-by: ApoC --- src/game/Spell.cpp | 4 ++-- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 51553cabb..44fe64ac2 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4678,7 +4678,7 @@ SpellCastResult Spell::CheckRange(bool strict) if(dist > max_range) return SPELL_FAILED_OUT_OF_RANGE; //0x5A; - if(dist < min_range) + if(min_range && dist < min_range) return SPELL_FAILED_TOO_CLOSE; if( m_caster->GetTypeId() == TYPEID_PLAYER && (m_spellInfo->FacingCasterFlags & SPELL_FACING_FLAG_INFRONT) && !m_caster->HasInArc( M_PI, target ) ) @@ -4689,7 +4689,7 @@ SpellCastResult Spell::CheckRange(bool strict) { if(!m_caster->IsWithinDist3d(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, max_range)) return SPELL_FAILED_OUT_OF_RANGE; - if(m_caster->IsWithinDist3d(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, min_range)) + if(min_range && m_caster->IsWithinDist3d(m_targets.m_destX, m_targets.m_destY, m_targets.m_destZ, min_range)) return SPELL_FAILED_TOO_CLOSE; } diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8b1147a8f..20c4fa01a 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8087" + #define REVISION_NR "8088" #endif // __REVISION_NR_H__