diff options
| author | acidmanifesto <joshua.lee.betts@gmail.com> | 2022-01-07 16:39:52 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-24 23:48:43 +0100 |
| commit | cba129310874d67562f89a7fbeb3e873ef927c49 (patch) | |
| tree | ea78039a5b00d1bb5aebb90f7bbfcdfd160c7a2e /src | |
| parent | 772104e134ea832993b24072bcf48bf6dcd516d3 (diff) | |
Scripts\Event: COG Corrections (#27532)
Goldshire is a area not a zone. Zone is Elwynn Forest.
CHILDEREN is spelled with 1 E not 2.
(cherry picked from commit 5fc650645d9b96f7298c4c11a6a1941d629ae601)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp (renamed from src/server/scripts/EasternKingdoms/zone_goldshire.cpp) | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index f69248c0e05..fdfb3000017 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -190,8 +190,8 @@ void AddSC_dun_morogh(); void AddSC_dun_morogh_area_coldridge_valley(); void AddSC_duskwood(); //void AddSC_eastern_plaguelands(); +void AddSC_elwynn_forest(); //void AddSC_ghostlands(); -void AddSC_goldshire(); void AddSC_hinterlands(); void AddSC_isle_of_queldanas(); void AddSC_redridge_mountains(); @@ -382,8 +382,8 @@ void AddEasternKingdomsScripts() AddSC_dun_morogh_area_coldridge_valley(); AddSC_duskwood(); //AddSC_eastern_plaguelands(); + AddSC_elwynn_forest(); //AddSC_ghostlands(); - AddSC_goldshire(); AddSC_hinterlands(); AddSC_isle_of_queldanas(); AddSC_redridge_mountains(); diff --git a/src/server/scripts/EasternKingdoms/zone_goldshire.cpp b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp index a40cfca45cb..d2817d92e1a 100644 --- a/src/server/scripts/EasternKingdoms/zone_goldshire.cpp +++ b/src/server/scripts/EasternKingdoms/zone_elwynn_forest.cpp @@ -74,7 +74,7 @@ enum COG_Events enum COG_GameEvent { - GAME_EVENT_CHILDEREN_OF_GOLDSHIRE = 76 + GAME_EVENT_CHILDREN_OF_GOLDSHIRE = 76 }; struct npc_cameron : public ScriptedAI @@ -180,14 +180,14 @@ struct npc_cameron : public ScriptedAI void OnGameEvent(bool start, uint16 eventId) override { - if (start && eventId == GAME_EVENT_CHILDEREN_OF_GOLDSHIRE) + if (start && eventId == GAME_EVENT_CHILDREN_OF_GOLDSHIRE) { // Start event at 7 am // Begin pathing _events.ScheduleEvent(EVENT_BEGIN_EVENT, 2s); _started = true; } - else if (!start && eventId == GAME_EVENT_CHILDEREN_OF_GOLDSHIRE) + else if (!start && eventId == GAME_EVENT_CHILDREN_OF_GOLDSHIRE) { // Reset event at 8 am _started = false; @@ -274,7 +274,7 @@ private: GuidVector _childrenGUIDs; }; -void AddSC_goldshire() +void AddSC_elwynn_forest() { RegisterCreatureAI(npc_cameron); } |