diff options
| author | Nyeriah <sarah.trysan@live.com> | 2016-02-10 03:21:49 -0200 |
|---|---|---|
| committer | Nyeriah <sarah.trysan@live.com> | 2016-02-10 03:21:49 -0200 |
| commit | b8445bbc202cce31c8c91303b9f6cd8e5901d4eb (patch) | |
| tree | 9c6d22320267df55214e0d8686802793657b1e67 /src | |
| parent | c559a4762dda460f9181cfc22af9adb8a949f635 (diff) | |
Scripts: Fix no-PCH
(cherry picked from commit 130f744c297008ed8b6f6536186513091f8f81fb)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp | 11 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp index cefbeb94924..36a41e2f628 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp @@ -18,6 +18,7 @@ #include "ScriptMgr.h" #include "InstanceScript.h" #include "magisters_terrace.h" +#include "EventMap.h" /* 0 - Selin Fireheart @@ -148,15 +149,15 @@ class instance_magisters_terrace : public InstanceMapScript void ProcessEvent(WorldObject* obj, uint32 eventId) override { if (eventId == EVENT_SPAWN_KALECGOS) - if (!ObjectAccessor::GetCreature(*obj, KalecgosGUID) && events.Empty()) - events.ScheduleEvent(EVENT_SPAWN_KALECGOS, Minutes(1)); + if (!ObjectAccessor::GetCreature(*obj, KalecgosGUID) && Events.Empty()) + Events.ScheduleEvent(EVENT_SPAWN_KALECGOS, Minutes(1)); } void Update(uint32 diff) override { - events.Update(diff); + Events.Update(diff); - if (events.ExecuteEvent() == EVENT_SPAWN_KALECGOS) + if (Events.ExecuteEvent() == EVENT_SPAWN_KALECGOS) if (Creature* kalecgos = instance->SummonCreature(NPC_KALECGOS, KalecgosSpawnPos)) { kalecgos->GetMotionMaster()->MovePath(PATH_KALECGOS_FLIGHT, false); @@ -202,7 +203,7 @@ class instance_magisters_terrace : public InstanceMapScript } protected: - EventMap events; + EventMap Events; ObjectGuid SelinGUID; ObjectGuid DelrissaGUID; ObjectGuid KaelStatue[2]; diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp index 82bb61c5afd..5b90ac8ccf4 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp @@ -32,6 +32,7 @@ EndContentData */ #include "ScriptedGossip.h" #include "Player.h" #include "magisters_terrace.h" +#include "EventMap.h" /*###### ## npc_kalecgos |