mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7468] Convert pet cast check code to use SpellCastResult and finaly fix SPELL_CAST_OK value (255 custom value now)

Browse source
This commit is contained in:
VladimirMangos 2009-03-16 15:39:10 +03:00
parent 0e987bf59e
commit 5d6cb5fe80
7 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/Spell.cpp
View file

@ -4394,7 +4394,7 @@ SpellCastResult Spell::CheckCast(bool strict)
return SPELL_CAST_OK;
}
int16 Spell::PetCanCast(Unit* target)
SpellCastResult Spell::CheckPetCast(Unit* target)
{
if(!m_caster->isAlive())
return SPELL_FAILED_CASTER_DEAD;
@ -4458,11 +4458,7 @@ int16 Spell::PetCanCast(Unit* target)
return SPELL_FAILED_NOT_READY;
}
SpellCastResult result = CheckCast(true);
if(result != SPELL_CAST_OK)
return result;
else
return -1; //this allows to check spell fail 0, in combat
return CheckCast(true);
}
SpellCastResult Spell::CheckCasterAuras() const
@ -4589,9 +4585,9 @@ bool Spell::CanAutoCast(Unit* target)
}
}
int16 result = PetCanCast(target);
SpellCastResult result = CheckPetCast(target);
if(result == -1 || result == SPELL_FAILED_UNIT_NOT_INFRONT)
if(result == SPELL_CAST_OK || result == SPELL_FAILED_UNIT_NOT_INFRONT)
{
FillTargetMap();
//check if among target units, our WANTED target is as well (->only self cast spells return false)