From 3eba06e4ad7c9b92babd3df14d0602212e60b7cc Mon Sep 17 00:00:00 2001 From: megamage Date: Mon, 16 Mar 2009 12:00:14 -0600 Subject: *Use SpellCastResult and finaly fix SPELL_CAST_OK value (255 custom value now). By VladimirMangos. --HG-- branch : trunk --- src/game/PetHandler.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/game/PetHandler.cpp') diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 11caeb74a55..9f9cb3a33a3 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -207,7 +207,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) Spell *spell = new Spell(pet, spellInfo, false); - int16 result = spell->PetCanCast(unit_target); + SpellCastResult result = spell->CheckPetCast(unit_target); //auto turn to target unless possessed if(result == SPELL_FAILED_UNIT_NOT_INFRONT && !pet->isPossessed()) @@ -218,10 +218,10 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) if(Unit* powner = pet->GetCharmerOrOwner()) if(powner->GetTypeId() == TYPEID_PLAYER) pet->SendUpdateToPlayer((Player*)powner); - result = -1; + result = SPELL_CAST_OK; } - if(result == -1) + if(result == SPELL_CAST_OK) { ((Creature*)pet)->AddCreatureSpellCooldown(spellid); if (((Creature*)pet)->isPet()) @@ -624,8 +624,8 @@ void WorldSession::HandlePetCastSpellOpcode( WorldPacket& recvPacket ) spell->m_cast_count = cast_count; // probably pending spell cast spell->m_targets = targets; - int16 result = spell->PetCanCast(NULL); - if(result == -1) + SpellCastResult result = spell->CheckPetCast(NULL); + if(result == SPELL_CAST_OK) { if(caster->GetTypeId() == TYPEID_UNIT) { -- cgit v1.2.3