diff options
| -rwxr-xr-x | src/server/game/AI/CoreAI/CombatAI.cpp | 1 | ||||
| -rwxr-xr-x | src/server/game/AI/CoreAI/UnitAI.h | 6 | ||||
| -rwxr-xr-x | src/server/game/AI/EventAI/CreatureEventAI.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/Creature/Creature.cpp | 5 | ||||
| -rwxr-xr-x | src/server/game/Entities/Creature/Creature.h | 6 | ||||
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.cpp | 4 | ||||
| -rwxr-xr-x | src/server/game/Entities/Pet/Pet.h | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp index 1547b6f4513..946fe664798 100755 --- a/src/server/game/AI/CoreAI/CombatAI.cpp +++ b/src/server/game/AI/CoreAI/CombatAI.cpp @@ -110,6 +110,7 @@ void CombatAI::UpdateAI(const uint32 diff) else DoMeleeAttackIfReady(); } + void CombatAI::SpellInterrupted(uint32 spellId, uint32 unTimeMs) { events.RescheduleEvent(spellId, unTimeMs); diff --git a/src/server/game/AI/CoreAI/UnitAI.h b/src/server/game/AI/CoreAI/UnitAI.h index bd3b9fa6ee9..e824ac0e76b 100755 --- a/src/server/game/AI/CoreAI/UnitAI.h +++ b/src/server/game/AI/CoreAI/UnitAI.h @@ -241,9 +241,9 @@ class UnitAI // Called when the unit heals virtual void HealDone(Unit* /*done_to*/, uint32& /*addhealth*/) {} - - // Called when a spell is interrupted by Spell::EffectInterruptCast - // Use to reschedule next planned cast of spell. + + /// Called when a spell is interrupted by Spell::EffectInterruptCast + /// Use to reschedule next planned cast of spell. virtual void SpellInterrupted(uint32 /*spellId*/, uint32 /*unTimeMs*/) {} void AttackStartCaster(Unit* victim, float dist); diff --git a/src/server/game/AI/EventAI/CreatureEventAI.cpp b/src/server/game/AI/EventAI/CreatureEventAI.cpp index 7bb1a2c8116..951a035628a 100755 --- a/src/server/game/AI/EventAI/CreatureEventAI.cpp +++ b/src/server/game/AI/EventAI/CreatureEventAI.cpp @@ -1308,7 +1308,7 @@ bool CreatureEventAI::CanCast(Unit* target, SpellInfo const* spell, bool trigger //Silenced so we can't cast if (!triggered && me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SILENCED)) return false; - + //Check for power if (!triggered && me->GetPower((Powers)spell->PowerType) < spell->CalcPowerCost(me, spell->GetSchoolMask())) return false; @@ -1316,7 +1316,7 @@ bool CreatureEventAI::CanCast(Unit* target, SpellInfo const* spell, bool trigger //Unit is out of range of this spell if (!me->IsInRange(target, spell->GetMinRange(false), spell->GetMaxRange(false))) return false; - + //Spell is on cooldown if (me->HasSpellCooldown(spell->Id)) return false; diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 5b0c2c871e7..0b9d0b40b4a 100755 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -2238,7 +2238,7 @@ void Creature::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs { if (m_spells[i] == 0) continue; - + uint32 unSpellId = m_spells[i]; SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(unSpellId); if (!spellInfo) @@ -2257,10 +2257,9 @@ void Creature::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs if ((idSchoolMask & spellInfo->GetSchoolMask()) && GetCreatureSpellCooldownDelay(unSpellId) < unTimeMs) { _AddCreatureSpellCooldown(unSpellId, curTime + unTimeMs/IN_MILLISECONDS); - if(UnitAI *ai = GetAI()) + if (UnitAI* ai = GetAI()) ai->SpellInterrupted(unSpellId, unTimeMs); } - } } diff --git a/src/server/game/Entities/Creature/Creature.h b/src/server/game/Entities/Creature/Creature.h index d1142620bd2..7359385cd0a 100755 --- a/src/server/game/Entities/Creature/Creature.h +++ b/src/server/game/Entities/Creature/Creature.h @@ -540,13 +540,13 @@ class Creature : public Unit, public GridObject<Creature>, public MapCreature void AddCreatureSpellCooldown(uint32 spellid); bool HasSpellCooldown(uint32 spell_id) const; bool HasCategoryCooldown(uint32 spell_id) const; - uint32 GetCreatureSpellCooldownDelay(uint32 spell_id) const + uint32 GetCreatureSpellCooldownDelay(uint32 spellId) const { - CreatureSpellCooldowns::const_iterator itr = m_CreatureSpellCooldowns.find(spell_id); + CreatureSpellCooldowns::const_iterator itr = m_CreatureSpellCooldowns.find(spellId); time_t t = time(NULL); return uint32(itr != m_CreatureSpellCooldowns.end() && itr->second > t ? itr->second - t : 0); } - virtual void ProhibitSpellSchool(SpellSchoolMask, uint32); + virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs); bool HasSpell(uint32 spellID) const; diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index cb5922a03c0..b2cdb56a33e 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -2066,7 +2066,7 @@ void Pet::ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs) _AddCreatureSpellCooldown(unSpellId, curTime + unTimeMs/IN_MILLISECONDS); } } - if(Player *owner = GetOwner()) + + if (Player* owner = GetOwner()) owner->GetSession()->SendPacket(&data); - }
\ No newline at end of file diff --git a/src/server/game/Entities/Pet/Pet.h b/src/server/game/Entities/Pet/Pet.h index 14888e1a513..c0c47367240 100755 --- a/src/server/game/Entities/Pet/Pet.h +++ b/src/server/game/Entities/Pet/Pet.h @@ -200,7 +200,7 @@ class Pet : public Guardian bool unlearnSpell(uint32 spell_id, bool learn_prev, bool clear_ab = true); bool removeSpell(uint32 spell_id, bool learn_prev, bool clear_ab = true); void CleanupActionBar(); - virtual void ProhibitSpellSchool(SpellSchoolMask, uint32); + virtual void ProhibitSpellSchool(SpellSchoolMask idSchoolMask, uint32 unTimeMs); PetSpellMap m_spells; AutoSpellList m_autospells; |