*Fix some typos in ScriptedInstances.

--HG--
branch : trunk
This commit is contained in:
Anubisss
2009-04-11 16:15:19 +02:00
parent 73c11195c7
commit 171866e388
5 changed files with 12 additions and 12 deletions
@@ -58,13 +58,13 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
FelOverseerCount = 0; FelOverseerCount = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounter[i] = false; Encounter[i] = NOT_STARTED;
} }
bool IsEncounterInProgress() const bool IsEncounterInProgress() const
{ {
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
if(Encounter[i]) return true; if(Encounter[i] == IN_PROGRESS) return true;
return false; return false;
} }
@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
uint64 StrangePool; uint64 StrangePool;
bool ShieldGeneratorDeactivated[4]; bool ShieldGeneratorDeactivated[4];
bool Encounters[ENCOUNTERS]; uint32 Encounters[ENCOUNTERS];
void Initialize() void Initialize()
{ {
@@ -93,13 +93,13 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
ShieldGeneratorDeactivated[3] = false; ShieldGeneratorDeactivated[3] = false;
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounters[i] = false; Encounters[i] = NOT_STARTED;
} }
bool IsEncounterInProgress() const bool IsEncounterInProgress() const
{ {
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
if(Encounters[i]) return true; if(Encounters[i] == IN_PROGRESS) return true;
return false; return false;
} }
@@ -35,7 +35,7 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
{ {
instance_gruuls_lair(Map *map) : ScriptedInstance(map) {Initialize();}; instance_gruuls_lair(Map *map) : ScriptedInstance(map) {Initialize();};
bool Encounters[ENCOUNTERS]; uint32 Encounters[ENCOUNTERS];
uint64 MaulgarEvent_Tank; uint64 MaulgarEvent_Tank;
uint64 KigglerTheCrazed; uint64 KigglerTheCrazed;
@@ -61,13 +61,13 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounters[i] = false; Encounters[i] = NOT_STARTED;
} }
bool IsEncounterInProgress() const bool IsEncounterInProgress() const
{ {
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
if(Encounters[i]) return true; if(Encounters[i] == IN_PROGRESS) return true;
return false; return false;
} }
@@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
bool IsEncounterInProgress() const bool IsEncounterInProgress() const
{ {
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
if(Encounter[i]) if(Encounter[i] == IN_PROGRESS)
return true; return true;
return false; return false;
@@ -48,7 +48,7 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
uint8 KaelthasEventPhase; uint8 KaelthasEventPhase;
uint8 AlarEventPhase; uint8 AlarEventPhase;
bool Encounters[ENCOUNTERS]; uint32 Encounters[ENCOUNTERS];
void Initialize() void Initialize()
{ {
@@ -64,13 +64,13 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
AlarEventPhase = 0; AlarEventPhase = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
Encounters[i] = false; Encounters[i] = NOT_STARTED;
} }
bool IsEncounterInProgress() const bool IsEncounterInProgress() const
{ {
for(uint8 i = 0; i < ENCOUNTERS; i++) for(uint8 i = 0; i < ENCOUNTERS; i++)
if(Encounters[i]) return true; if(Encounters[i] == IN_PROGRESS) return true;
return false; return false;
} }