diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-24 18:59:59 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-24 18:59:59 +0200 |
| commit | 72c2a8cfa6e40cfd5b751dd6d023d4681e6676af (patch) | |
| tree | 1de4d9e167cecfb679203b9c3a344f2f1d1c41d8 /src/server/scripts | |
| parent | b43688b684f8a7b93ae529df3626737883fde354 (diff) | |
Core: Fix warnings
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp | 14 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp index 1348bc7051f..a6266fe8b73 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/boss_nefarian.cpp @@ -161,12 +161,10 @@ public: void Reset() { - if(me->GetMapId() == 229) - { + if (me->GetMapId() == 229) events.ScheduleEvent(EVENT_PLAYER_CHECK, 5000); - } - if(me->GetMapId() == 469) + if (me->GetMapId() == 469) { if (!me->FindNearestCreature(NPC_NEFARIAN, 1000.0f, true)) _Reset(); @@ -220,14 +218,14 @@ public: { events.Update(diff); - if(me->GetMapId() == 229) // UBRS EVENTS + if (me->GetMapId() == 229) // UBRS EVENTS { while (uint32 eventId = events.ExecuteEvent()) { switch (eventId) { case EVENT_PLAYER_CHECK: - if (Unit* player = SelectTarget(SELECT_TARGET_NEAREST, 0, 30.0f, false)) + if (SelectTarget(SELECT_TARGET_NEAREST, 0, 30.0f, true)) events.ScheduleEvent(EVENT_GYTH_REND_1, 1000); else events.ScheduleEvent(EVENT_PLAYER_CHECK, 5000); @@ -262,7 +260,7 @@ public: } } - if(me->GetMapId() != 469) + if (me->GetMapId() != 469) return; // Only do this if we haven't spawned nefarian yet @@ -378,7 +376,7 @@ public: canDespawn = true; } - void EnterCombat(Unit* who) + void EnterCombat(Unit* /*who*/) { events.ScheduleEvent(EVENT_SHADOWFLAME, 12000); events.ScheduleEvent(EVENT_FEAR, urand(25000, 35000)); diff --git a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp index f19e2abcd40..483cf3261b8 100644 --- a/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp +++ b/src/server/scripts/EasternKingdoms/BlackwingLair/instance_blackwing_lair.cpp @@ -207,6 +207,8 @@ public: _events.ScheduleEvent(EVENT_RESPAWN_NEFARIUS, 15*IN_MILLISECONDS*MINUTE); SetBossState(BOSS_NEFARIAN, NOT_STARTED); break; + default: + break; } break; } |