diff options
5 files changed, 12 insertions, 12 deletions
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp index c87670085a3..a3966975f95 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp @@ -58,13 +58,13 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance FelOverseerCount = 0; for(uint8 i = 0; i < ENCOUNTERS; i++) - Encounter[i] = false; + Encounter[i] = NOT_STARTED; } bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) - if(Encounter[i]) return true; + if(Encounter[i] == IN_PROGRESS) return true; return false; } diff --git a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp index 94e94c9be50..0aceef32714 100644 --- a/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp +++ b/src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp @@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance uint64 StrangePool; bool ShieldGeneratorDeactivated[4]; - bool Encounters[ENCOUNTERS]; + uint32 Encounters[ENCOUNTERS]; void Initialize() { @@ -93,13 +93,13 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance ShieldGeneratorDeactivated[3] = false; for(uint8 i = 0; i < ENCOUNTERS; i++) - Encounters[i] = false; + Encounters[i] = NOT_STARTED; } bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) - if(Encounters[i]) return true; + if(Encounters[i] == IN_PROGRESS) return true; return false; } diff --git a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp index c5a82bff322..61c7e71ea2a 100644 --- a/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp +++ b/src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp @@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance { instance_gruuls_lair(Map *map) : ScriptedInstance(map) {Initialize();}; - bool Encounters[ENCOUNTERS]; + uint32 Encounters[ENCOUNTERS]; uint64 MaulgarEvent_Tank; uint64 KigglerTheCrazed; @@ -61,13 +61,13 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance for(uint8 i = 0; i < ENCOUNTERS; i++) - Encounters[i] = false; + Encounters[i] = NOT_STARTED; } bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) - if(Encounters[i]) return true; + if(Encounters[i] == IN_PROGRESS) return true; return false; } diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp index ddf648d52fd..5f1fb087655 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp @@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) - if(Encounter[i]) + if(Encounter[i] == IN_PROGRESS) return true; return false; diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp index 6f7dcb0f10d..c6352a9e67c 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp @@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance uint8 KaelthasEventPhase; uint8 AlarEventPhase; - bool Encounters[ENCOUNTERS]; + uint32 Encounters[ENCOUNTERS]; void Initialize() { @@ -64,13 +64,13 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance AlarEventPhase = 0; for(uint8 i = 0; i < ENCOUNTERS; i++) - Encounters[i] = false; + Encounters[i] = NOT_STARTED; } bool IsEncounterInProgress() const { for(uint8 i = 0; i < ENCOUNTERS; i++) - if(Encounters[i]) return true; + if(Encounters[i] == IN_PROGRESS) return true; return false; } |