diff options
Diffstat (limited to 'src/server/scripts')
5 files changed, 27 insertions, 14 deletions
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp index eb8a525f875..273fa33414f 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/boss_varos.cpp @@ -182,7 +182,7 @@ class npc_azure_ring_captain : public CreatureScript } } - void UpdateAI(const uint32 diff) + void UpdateAI(const uint32 /*diff*/) { if (!UpdateVictim()) return; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp index 835c73912e7..2511a509aaf 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp @@ -81,6 +81,10 @@ public: } } + void ProcessEvent(GameObject* /*go*/, uint32 /*eventId*/) + { + } + void ProcessEvent(Unit* /*unit*/, uint32 eventId) { if (eventId != EVENT_CALL_DRAGON) diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp index d0acb967238..a021a9ba6e0 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_general_vezax.cpp @@ -76,8 +76,8 @@ enum eEvents EVENT_BERSERK = 6, }; -#define ACHIEVEMENT_SMELL_SARONITE RAID_MODE(3181, 3188) -#define ACHIEVEMENT_SHADOWDODGER RAID_MODE(2996, 2997) +#define ACHIEVEMENT_SMELL_SARONITE RAID_MODE<uint32>(3181, 3188) +#define ACHIEVEMENT_SHADOWDODGER RAID_MODE<uint32>(2996, 2997) class boss_general_vezax : public CreatureScript { @@ -156,16 +156,18 @@ public: events.ScheduleEvent(EVENT_SEARING_FLAMES, urand(14000, 17500)); break; case EVENT_MARK_OF_THE_FACELESS: - Unit* pTarget; + { /* He will not cast this on players within 15 yards of him. However, if there are not at least 9 people outside of 15 yards he will start casting it on players inside 15 yards melee and tank included. */ - if (!(pTarget = CheckPlayersInRange(RAID_MODE(4,9), 15.0f, 50.f))) - pTarget = SelectTarget(SELECT_TARGET_RANDOM); - DoCast(pTarget, SPELL_MARK_OF_THE_FACELESS); + Unit* target = CheckPlayersInRange(RAID_MODE<uint32>(4,9), 15.0f, 50.f); + if (!target) + target = SelectTarget(SELECT_TARGET_RANDOM); + DoCast(target, SPELL_MARK_OF_THE_FACELESS); events.ScheduleEvent(EVENT_MARK_OF_THE_FACELESS, urand(35000, 45000)); break; + } case EVENT_SURGE_OF_DARKNESS: DoScriptText(EMOTE_SURGE_OF_DARKNESS, me); DoScriptText(SAY_SURGE_OF_DARKNESS, me); @@ -261,9 +263,9 @@ public: Purpose: If there are uiPlayersMin people within uiRangeMin, uiRangeMax: return a random players in that range. If not, return NULL and allow other target selection */ - Unit * CheckPlayersInRange(uint32 uiPlayersMin, float uiRangeMin, float uiRangeMax) + Unit* CheckPlayersInRange(uint32 uiPlayersMin, float uiRangeMin, float uiRangeMax) { - Map * pMap = me->GetMap(); + Map* pMap = me->GetMap(); if (pMap && pMap->IsDungeon()) { std::list<Player*> PlayerList; diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp index c4538abffd9..3523b53835f 100644 --- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp +++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp @@ -253,13 +253,13 @@ public: } } - void ProcessEvent(GameObject* /*go*/, uint32 uiEventId) + void ProcessEvent(GameObject* /*go*/, uint32 eventId) { // Flame Leviathan's Tower Event triggers Creature* pFlameLeviathan = instance->GetCreature(uiLeviathanGUID); if (pFlameLeviathan && pFlameLeviathan->isAlive()) //No leviathan, no event triggering ;) - switch(uiEventId) + switch(eventId) { case EVENT_TOWER_OF_STORM_DESTROYED: pFlameLeviathan->AI()->DoAction(1); @@ -276,6 +276,10 @@ public: } } + void ProcessEvent(Unit* /*unit*/, uint32 /*eventId*/) + { + } + bool SetBossState(uint32 type, EncounterState state) { if (!InstanceScript::SetBossState(type, state)) diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp index a0d5eb3d173..a6d6e3e4f39 100644 --- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp +++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp @@ -798,16 +798,19 @@ public: void ProcessEvent(GameObject* /*pGO*/, uint32 uiEventId) { - switch(uiEventId) + switch (uiEventId) { case EVENT_ACTIVATE_CRYSTAL: bCrystalActivated = true; // Activation by player's will throw event signal ActivateCrystal(); break; } - } + } -}; + void ProcessEvent(Unit* /*unit*/, uint32 /*eventId*/) + { + } + }; }; |