aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoracidmanifesto <joshua.lee.betts@gmail.com>2022-01-07 16:39:52 +0100
committerGitHub <noreply@github.com>2022-01-07 17:39:52 +0200
commit5fc650645d9b96f7298c4c11a6a1941d629ae601 (patch)
treeb431951bf5f66410a9d7ba1204a7a102e9231429
parent1dcbad76fccbe6ba5982b0ebf044ccd1b6b1eba0 (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.
-rw-r--r--src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp4
-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 ab79ff63f64..e9c1237cc5c 100644
--- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
+++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp
@@ -178,8 +178,8 @@ void AddSC_instance_zulgurub();
void AddSC_blasted_lands();
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();
@@ -356,8 +356,8 @@ void AddEasternKingdomsScripts()
AddSC_blasted_lands();
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 c26459b96a3..ebe2e29554f 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);
}