diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-14 16:52:13 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-08-14 16:52:13 +0200 |
| commit | 11ecb9c63339bcf5de3a87374d8d2e12cd79d249 (patch) | |
| tree | f66675905fa77433e073d7cc9c17baaab011382f /src/server/scripts | |
| parent | c8b722e4a44195ab757f0b4d454f92767d65d45f (diff) | |
| parent | 5890f95f7cd7a885b667fe9b5da2dceea22b9b81 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/Spell.h
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp index 678bd884cb7..9876da73004 100644 --- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp +++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp @@ -23,9 +23,9 @@ enum Spells { SPELL_SEARING_SHADOWS = 96913, - SPEll_FOCUSED_FIRE_FIRST_DAMAGE = 97212, - SPEll_FOCUSED_FIRE_TRIGGER = 96872, - SPEll_FOCUSED_FIRE_VISUAL = 96886, + SPELL_FOCUSED_FIRE_FIRST_DAMAGE = 97212, + SPELL_FOCUSED_FIRE_TRIGGER = 96872, + SPELL_FOCUSED_FIRE_VISUAL = 96886, SPELL_FOCUSED_FIRE = 96884, SPELL_EYES_OF_OCCUTHAR = 96920, SPELL_GAZE_OF_OCCUTHAR = 96942, @@ -95,7 +95,7 @@ class boss_occuthar : public CreatureScript for (uint8 i = 0; i < MAX_OCCUTHAR_VEHICLE_SEATS; ++i) { if (Unit* vehicle = _vehicle->GetPassenger(i)) - vehicle->CastSpell(summon, SPEll_FOCUSED_FIRE_VISUAL); + vehicle->CastSpell(summon, SPELL_FOCUSED_FIRE_VISUAL); } } } @@ -119,7 +119,7 @@ class boss_occuthar : public CreatureScript events.ScheduleEvent(EVENT_SEARING_SHADOWS, 25 * IN_MILLISECONDS); break; case EVENT_FOCUSED_FIRE: - DoCastAOE(SPEll_FOCUSED_FIRE_TRIGGER, true); + DoCastAOE(SPELL_FOCUSED_FIRE_TRIGGER, true); events.ScheduleEvent(EVENT_FOCUSED_FIRE, 15 * IN_MILLISECONDS); break; case EVENT_EYES_OF_OCCUTHAR: @@ -180,7 +180,7 @@ class npc_eyestalk : public CreatureScript if (_events.ExecuteEvent() == EVENT_FOCUSED_FIRE_FIRST_DAMAGE) { - DoCastAOE(SPEll_FOCUSED_FIRE_FIRST_DAMAGE); + DoCastAOE(SPELL_FOCUSED_FIRE_FIRST_DAMAGE); if (++_damageCount < 2) _events.ScheduleEvent(EVENT_FOCUSED_FIRE_FIRST_DAMAGE, 1 * IN_MILLISECONDS); } |