josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge [SD2]

Browse Source 
r1240 Update scripts, increment/decrement variables using operator before instead of after variable, mainly for code consistency. Original patch by Meldanor.

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-13 22:27:55 +02:00
parent 598e23ff0d
commit 8212baca88
73 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bindings/scripts/ScriptMgr.cpp
+2 -2
View File
@@ -924,7 +924,7 @@ void ScriptsFree()
delete []SpellSummary;
// Free resources before library unload
for(uint16 i =0;i<MAX_SCRIPTS;i++)
for(uint16 i =0;i<MAX_SCRIPTS;++i)
delete m_scripts[i];
num_sc_scripts = 0;
@@ -964,7 +964,7 @@ void ScriptsInit(char const* cfg_file = "trinitycore.conf")
bar.step();
outstring_log("");
for(uint16 i =0;i<MAX_SCRIPTS;i++)
for(uint16 i =0;i<MAX_SCRIPTS;++i)
m_scripts[i]=NULL;
FillSpellSummary();
src/bindings/scripts/scripts/boss/boss_ysondre.cpp
+3 -3
View File
@@ -145,7 +145,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
{
// summon 10 druids
Unit* target = NULL;
for(uint8 i = 0; i < 10;i++)
for(uint8 i = 0; i < 10; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
SummonDruids(target);
@@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
{
// summon 10 druids
Unit* target = NULL;
for(uint8 i = 0; i < 10;i++)
for(uint8 i = 0; i < 10; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
SummonDruids(target);
@@ -179,7 +179,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
{
// summon 10 druids
Unit* target = NULL;
for(uint8 i = 0; i < 10;i++)
for(uint8 i = 0; i < 10; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
SummonDruids(target);
src/bindings/scripts/scripts/npc/npc_professions.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ bool EquippedOk(Player* player, uint32 spellId)
if( !spell )
return false;
for(uint8 i=0; i<3; i++)
for(uint8 i=0; i<3; ++i)
{
uint32 reqSpell = spell->EffectTriggerSpell[i];
if( !reqSpell )
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+1 -1
View File
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
{
if(!sumportals)
{
for (int i = 0;i<5;i++)
for (int i = 0;i<5; ++i)
{
Creature *Portal = NULL;
Portal = m_creature->SummonCreature(MOB_VOID_PORTAL,VoidPortalCoords[i][0],VoidPortalCoords[i][1],VoidPortalCoords[i][2],0,TEMPSUMMON_CORPSE_DESPAWN,3000000);
src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+2 -2
View File
@@ -57,13 +57,13 @@ struct TRINITY_DLL_DECL instance_shadow_labyrinth : public ScriptedInstance
GrandmasterVorpil = 0;
FelOverseerCount = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounter[i] == IN_PROGRESS) return true;
return false;
src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp
+1 -1
View File
@@ -162,7 +162,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
{
Unit* target = *itr;
if(!target) return;
for(uint32 i = 0;i<3;i++)
for(uint32 i = 0;i<3; ++i)
{
uint8 eff = spellInfo->Effect[i];
if (eff>=TOTAL_SPELL_EFFECTS)
src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+8 -8
View File
@@ -401,7 +401,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
{
if(summon->GetCreatureInfo()->Entry == FLAME_OF_AZZINOTH)
{
for(uint8 i = 0; i < 2; i++)
for(uint8 i = 0; i < 2; ++i)
if(summon->GetGUID() == FlameGUID[i])
FlameGUID[i] = 0;
@@ -598,7 +598,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
Timer[EVENT_FLIGHT_SEQUENCE] = 0;
break;
case 8://glaive return
for(uint8 i = 0; i < 2; i++)
for(uint8 i = 0; i < 2; ++i)
{
if(GlaiveGUID[i])
{
@@ -616,7 +616,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_LEVITATING);
m_creature->StopMoving();
m_creature->HandleEmoteCommand(EMOTE_ONESHOT_LAND);
for(uint8 i = 0; i < 2; i++)
for(uint8 i = 0; i < 2; ++i)
{
if(GlaiveGUID[i])
{
@@ -696,7 +696,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
return;
Event = EVENT_NULL;
for(uint32 i = 1; i <= MaxTimer[Phase]; i++)
for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
{
if(Timer[i]) // Event is enabled
if(Timer[i] <= diff)
@@ -1001,7 +1001,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
pInstance->HandleGameObject(GateGUID, false);
for(uint8 i = 0; i < 2; i++)
for(uint8 i = 0; i < 2; ++i)
pInstance->HandleGameObject(DoorGUID[i], false);
}
@@ -1072,7 +1072,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
pInstance->SetData(DATA_ILLIDANSTORMRAGEEVENT, IN_PROGRESS);
for(uint8 i = 0; i < 2; i++)
for(uint8 i = 0; i < 2; ++i)
pInstance->HandleGameObject(DoorGUID[i], false);
if(GETCRE(Illidan, IllidanGUID))
@@ -1269,7 +1269,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
switch(WalkCount)
{
case 6:
for(uint8 i = 0; i < 2; i++)
for(uint8 i = 0; i < 2; ++i)
pInstance->HandleGameObject(DoorGUID[i], true);
break;
case 8:
@@ -1500,7 +1500,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
return;
Event = EVENT_MAIEV_NULL;
for(uint8 i = 1; i <= MaxTimer; i++)
for(uint8 i = 1; i <= MaxTimer; ++i)
if(Timer[i])
{
if(Timer[i] <= diff)
src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp
+2 -2
View File
@@ -105,7 +105,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
if(pInstance)
pInstance->SetData(DATA_MOTHERSHAHRAZEVENT, NOT_STARTED);
for(uint8 i = 0; i<3; i++)
for(uint8 i = 0; i<3; ++i)
TargetGUID[i] = 0;
BeamTimer = 20000; // Timers may be incorrect
@@ -155,7 +155,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
float X = TeleportPoint[random].x;
float Y = TeleportPoint[random].y;
float Z = TeleportPoint[random].z;
for(uint8 i = 0; i < 3; i++)
for(uint8 i = 0; i < 3; ++i)
{
Unit* pUnit = SelectUnit(SELECT_TARGET_RANDOM, 1);
if(pUnit && pUnit->isAlive() && (pUnit->GetTypeId() == TYPEID_PLAYER))
src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp
+1 -1
View File
@@ -288,7 +288,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
std::list<HostilReference*>::iterator i = m_threatlist.begin();
for(i = m_threatlist.begin(); i != m_threatlist.end(); i++)
for(i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
if(pUnit && pUnit->isAlive())
src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp
+2 -2
View File
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
MobCount = 0;
MobDeath_Timer = 0;
for(uint8 i = 0; i < MOB_AMOUNT; i++)
for(uint8 i = 0; i < MOB_AMOUNT; ++i)
RingMobGUID[i] = 0;
RingBossGUID = 0;
@@ -212,7 +212,7 @@ struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
return;
}
for(uint8 i = 0; i < MOB_AMOUNT; i++)
for(uint8 i = 0; i < MOB_AMOUNT; ++i)
{
Creature *mob = Unit::GetCreature(*m_creature,RingMobGUID[i]);
if (mob && !mob->isAlive() && mob->isDead())
src/bindings/scripts/scripts/zone/blackrock_depths/instance_blackrock_depths.cpp
+3 -3
View File
@@ -136,9 +136,9 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
TombTimer = TIMER_TOMBOFTHESEVEN;
TombEventCounter = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
for(uint8 i = 0; i < 7; i++)
for(uint8 i = 0; i < 7; ++i)
TombBossGUIDs[i] = 0;
}
@@ -353,7 +353,7 @@ struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
{
HandleGameObject(GoTombExitGUID,false);//event reseted, close exit door
HandleGameObject(GoTombEnterGUID,true);//event reseted, open entrance door
for(uint8 i = 0; i < 7; i++)
for(uint8 i = 0; i < 7; ++i)
{
if(Creature* boss = instance->GetCreature(TombBossGUIDs[i]))
{
src/bindings/scripts/scripts/zone/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+1 -1
View File
@@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL boss_meathookAI : public ScriptedAI
}
Unit* targets[st];
int st2=0;
for(int i=1; i<=st; i++){
for(int i=1; i<=st; ++i){
if(!IsWithinLOSInMap(targets[i])
st2++;
}
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp
+1 -1
View File
@@ -316,7 +316,7 @@ struct TRINITY_DLL_DECL npc_time_riftAI : public ScriptedAI
if (entry == C_WHELP)
{
for(uint8 i = 0; i < 3; i++)
for(uint8 i = 0; i < 3; ++i)
DoSummonAtRift(entry);
}else DoSummonAtRift(entry);
}
src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/instance_dark_portal.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ struct TRINITY_DLL_DECL instance_dark_portal : public ScriptedInstance
void Clear()
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
mRiftPortalCount = 0;
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp
+15 -15
View File
@@ -311,7 +311,7 @@ hyjalAI::hyjalAI(Creature *c) : npc_escortAI(c), Summons(m_creature)
pInstance = c->GetInstanceData();
VeinsSpawned[0] = false;
VeinsSpawned[1] = false;
for(uint8 i=0;i<14;i++)
for(uint8 i=0;i<14; ++i)
VeinGUID[i] = 0;
InfernalCount = 0;
TeleportTimer = 1000;
@@ -698,7 +698,7 @@ void hyjalAI::SpawnVeins()
{
if (VeinsSpawned[0])//prevent any buggers
return;
for (uint8 i = 0; i<7; i++)
for (uint8 i = 0; i<7; ++i)
{
GameObject* gem = m_creature->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0);
if(gem)
@@ -708,7 +708,7 @@ void hyjalAI::SpawnVeins()
}else{
if (VeinsSpawned[1])
return;
for (uint8 i = 7; i<14; i++)
for (uint8 i = 7; i<14; ++i)
{
GameObject* gem = m_creature->SummonGameObject(ANCIENT_VEIN,VeinPos[i][0],VeinPos[i][1],VeinPos[i][2],VeinPos[i][3],VeinPos[i][4],VeinPos[i][5],VeinPos[i][6],VeinPos[i][7],0);
if(gem)
@@ -727,7 +727,7 @@ void hyjalAI::DeSpawnVeins()
if (!pUnit)return;
hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI());
if(!ai)return;
for (uint8 i = 0; i<7; i++)
for (uint8 i = 0; i<7; ++i)
{
if (GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
gem->Delete();
@@ -738,7 +738,7 @@ void hyjalAI::DeSpawnVeins()
if (!pUnit)return;
hyjalAI* ai = CAST_AI(hyjalAI, pUnit->AI());
if(!ai)return;
for (uint8 i = 7; i<14; i++)
for (uint8 i = 7; i<14; ++i)
{
if(GameObject* gem = pInstance->instance->GetGameObject(pInstance->GetData64(ai->VeinGUID[i])))
gem->Delete();
@@ -768,7 +768,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
m_creature->SetVisibility(VISIBILITY_OFF);
HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
HideNearPos(5037.76, -1889.71);
for(uint8 i = 0; i < 92; i++)//summon fires
for(uint8 i = 0; i < 92; ++i)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
}
@@ -781,7 +781,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
HideNearPos(m_creature->GetPositionX(), m_creature->GetPositionY());
HideNearPos(5563, -2763.19);
HideNearPos(5542.2, -2629.36);
for(uint8 i = 0; i < 65; i++)//summon fires
for(uint8 i = 0; i < 65; ++i)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
}
@@ -1086,10 +1086,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
switch(faction)
{
case 0://alliance
for(uint8 i = 0; i < 92; i++)//summon fires
for(uint8 i = 0; i < 92; ++i)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,AllianceFirePos[i][0],AllianceFirePos[i][1],AllianceFirePos[i][2],AllianceFirePos[i][3],AllianceFirePos[i][4],AllianceFirePos[i][5],AllianceFirePos[i][6],AllianceFirePos[i][7],0);
for(uint8 i = 0; i < 25; i++)//summon 25 ghouls
for(uint8 i = 0; i < 25; ++i)//summon 25 ghouls
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(GHOUL, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
@@ -1101,7 +1101,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 3; i++)//summon 3 abominations
for(uint8 i = 0; i < 3; ++i)//summon 3 abominations
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(ABOMINATION, AllianceBase[r][0]+irand(-15,15), AllianceBase[r][1]+irand(-15,15), AllianceBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
@@ -1113,7 +1113,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 5; i++)//summon 5 gargoyles
for(uint8 i = 0; i < 5; ++i)//summon 5 gargoyles
{
Creature* pUnit = m_creature->SummonCreature(GARGOYLE, AllianceOverrunGargPos[i][0], AllianceOverrunGargPos[i][1], AllianceOverrunGargPos[i][2], AllianceOverrunGargPos[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
if(pUnit)
@@ -1127,10 +1127,10 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
}
break;
case 1://horde
for(uint8 i = 0; i < 65; i++)//summon fires
for(uint8 i = 0; i < 65; ++i)//summon fires
m_creature->SummonGameObject(FLAMEOBJECT,HordeFirePos[i][0],HordeFirePos[i][1],HordeFirePos[i][2],HordeFirePos[i][3],HordeFirePos[i][4],HordeFirePos[i][5],HordeFirePos[i][6],HordeFirePos[i][7],0);
for(uint8 i = 0; i < 26; i++)//summon infernals
for(uint8 i = 0; i < 26; ++i)//summon infernals
{
Creature* pUnit = m_creature->SummonCreature(GIANT_INFERNAL, InfernalSPWP[i][0], InfernalSPWP[i][1], InfernalSPWP[i][2], InfernalSPWP[i][3], TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
if(pUnit)
@@ -1142,7 +1142,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 25; i++)//summon 25 ghouls
for(uint8 i = 0; i < 25; ++i)//summon 25 ghouls
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(GHOUL, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
@@ -1154,7 +1154,7 @@ void hyjalAI::DoOverrun(uint32 faction, const uint32 diff)
pUnit->setActive(true);
}
}
for(uint8 i = 0; i < 5; i++)//summon 5 abominations
for(uint8 i = 0; i < 5; ++i)//summon 5 abominations
{
uint8 r = rand()%4;
Creature* pUnit = m_creature->SummonCreature(ABOMINATION, HordeBase[r][0]+irand(-15,15), HordeBase[r][1]+irand(-15,15), HordeBase[r][2], 0, TEMPSUMMON_MANUAL_DESPAWN, 2*60*1000);
src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjal_trash.cpp
+8 -8
View File
@@ -179,7 +179,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
}
if(m_creature->GetEntry() == ABOMINATION)
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
switch(OverrunType)
{
@@ -228,7 +228,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
Start(true, true);
break;
default:
for(uint8 i = 22; i < 36; i++)
for(uint8 i = 22; i < 36; ++i)
AddWaypoint( i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
SetDespawnAtEnd(true);
@@ -239,7 +239,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
}
if(m_creature->GetEntry() == GHOUL)
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
AddWaypoint(i, AllianceWPs[i][0]+irand(-3,3), AllianceWPs[i][1]+irand(-3,3), AllianceWPs[i][2]);
switch(OverrunType)
{
@@ -301,7 +301,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
Start(true, true);
break;
default:
for(uint8 i = 22; i < 36; i++)
for(uint8 i = 22; i < 36; ++i)
AddWaypoint( i-18, AllianceOverrunWP[i][0]+irand(-3,3), AllianceOverrunWP[i][1]+irand(-3,3), AllianceOverrunWP[i][2]);
SetDespawnAtEnd(true);
LastOverronPos = 17;
@@ -314,7 +314,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
{
if(m_creature->GetEntry() == GHOUL)
{
for(uint8 i = 0; i < 6; i++)
for(uint8 i = 0; i < 6; ++i)
AddWaypoint(i, HordeWPs[i][0]+irand(-3,3), HordeWPs[i][1]+irand(-3,3), HordeWPs[i][2]);
switch(OverrunType)
{
@@ -339,7 +339,7 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
Start(true, true);
break;
default:
for(uint8 i = 0; i < 16; i++)
for(uint8 i = 0; i < 16; ++i)
AddWaypoint( i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
SetDespawnAtEnd(true);
LastOverronPos = 21;
@@ -349,9 +349,9 @@ void hyjal_trashAI::UpdateAI(const uint32 diff)
}
if(m_creature->GetEntry() == ABOMINATION)
{
for(uint8 i = 0; i < 6; i++)
for(uint8 i = 0; i < 6; ++i)
AddWaypoint(i, HordeWPs[i][0]+irand(-10,10), HordeWPs[i][1]+irand(-10,10), HordeWPs[i][2]);
for(uint8 i = 0; i < 16; i++)
for(uint8 i = 0; i < 16; ++i)
AddWaypoint( i+6, HordeOverrunWP[i][0]+irand(-10,10), HordeOverrunWP[i][1]+irand(-10,10), HordeOverrunWP[i][2]);
SetDespawnAtEnd(true);
LastOverronPos = 21;
src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL instance_old_hillsbrad : public ScriptedInstance
TarethaGUID = 0;
EpochGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
RAdvisors[2] = pInstance->GetData64(DATA_CARIBDIS);
//Respawn of the 3 Advisors
Creature* pAdvisor = NULL;
for( int i=0; i<3; i++ )
for( int i=0; i<3; ++i )
if(RAdvisors[i])
{
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+1 -1
View File
@@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
}
void DeSummonBeams()
{
for(uint8 i=0;i<2;i++)
for(uint8 i=0;i<2; ++i)
{
Creature* mob = Unit::GetCreature(*m_creature,beams[i]);
if(mob)
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+4 -4
View File
@@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
}else CanAttack = true;
Unit *remo;
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
remo = Unit::GetUnit(*m_creature, ShieldGeneratorChannel[i]);
if (remo)
@@ -405,7 +405,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
DoTeleportTo(MIDDLE_X, MIDDLE_Y, MIDDLE_Z);
Creature *pCreature;
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
pCreature = m_creature->SummonCreature(SHIED_GENERATOR_CHANNEL, ShieldGeneratorChannelPos[i][0], ShieldGeneratorChannelPos[i][1], ShieldGeneratorChannelPos[i][2], ShieldGeneratorChannelPos[i][3], TEMPSUMMON_CORPSE_DESPAWN, 0);
if (pCreature)
@@ -596,7 +596,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
phase = 1;
Vashj = NULL;
for (int i = 0;i<8;i++)//search for nearest waypoint (up on stairs)
for (int i = 0;i<8; ++i)//search for nearest waypoint (up on stairs)
{
if (!x || !y || !z)
{
@@ -657,7 +657,7 @@ struct TRINITY_DLL_DECL mob_enchanted_elementalAI : public ScriptedAI
if( spell )
{
uint8 eff_mask=0;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!spell->Effect[i])
continue;
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+6 -6
View File
@@ -152,7 +152,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
pInstance = c->GetInstanceData();
Demon = 0;
for(uint8 i = 0; i < 3; i++)//clear guids
for(uint8 i = 0; i < 3; ++i)//clear guids
SpellBinderGUID[i] = 0;
}
@@ -207,7 +207,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
void CheckChannelers(bool DoEvade = true)
{
for(uint8 i = 0; i < 3; i++)
for(uint8 i = 0; i < 3; ++i)
{
if(Creature *add = Unit::GetCreature(*m_creature,SpellBinderGUID[i]))
add->DisappearAndDie();
@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
void CheckBanish()
{
uint8 AliveChannelers = 0;
for(uint8 i = 0; i < 3; i++)
for(uint8 i = 0; i < 3; ++i)
{
Unit *add = Unit::GetUnit(*m_creature,SpellBinderGUID[i]);
if (add && add->isAlive())
@@ -306,7 +306,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
//Despawn all Inner Demon summoned
void DespawnDemon()
{
for(uint8 i=0; i<5; i++)
for(uint8 i=0; i<5; ++i)
{
if(InnderDemon[i])
{
@@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
void CastConsumingMadness() //remove this once SPELL_INSIDIOUS_WHISPER is supported by core
{
for(uint8 i=0; i<5; i++)
for(uint8 i=0; i<5; ++i)
{
if(InnderDemon[i] > 0 )
{
@@ -509,7 +509,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
CAST_AI(mob_inner_demonAI, demon->AI())->victimGUID = (*itr)->GetGUID();
uint8 eff_mask=0;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!spell->Effect[i])
continue;
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+2 -2
View File
@@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
case 1: DoScriptText(SAY_SUMMON2, m_creature); break;
}
for(uint8 i = 0; i < 10; i++)
for(uint8 i = 0; i < 10; ++i)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM, 0);
Creature* Murloc = m_creature->SummonCreature(MurlocCords[i][0],MurlocCords[i][1],MurlocCords[i][2],MurlocCords[i][3],MurlocCords[i][4], TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
using std::set;
set<int>list;
set<int>::iterator itr;
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
counter = 0;
do{target = SelectTarget(SELECT_TARGET_RANDOM, 1, 50, true); //target players only
src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+2 -2
View File
@@ -92,13 +92,13 @@ struct TRINITY_DLL_DECL instance_serpentshrine_cavern : public ScriptedInstance
ShieldGeneratorDeactivated[2] = false;
ShieldGeneratorDeactivated[3] = false;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS) return true;
return false;
src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+2 -2
View File
@@ -75,13 +75,13 @@ struct TRINITY_DLL_DECL instance_steam_vault : public ScriptedInstance
AccessPanelHydro = 0;
AccessPanelMek = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if (Encounter[i] == IN_PROGRESS)
return true;
src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp
+1 -1
View File
@@ -380,7 +380,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
if ( questPhase == 1 ) { // no player check, quest can be finished as group, so no complex playerguid/group search code
for (int i = 0; i<4; i++) {
for (int i = 0; i<4; ++i) {
Creature* Summoned;
Summoned = DoSpawnCreature(PaladinEntry[i], SpawnPosition[i].x, SpawnPosition[i].y, SpawnPosition[i].z, SpawnPosition[i].o, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 180000);
src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
Phase2 = false;
Creature *pCreature = NULL;
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
if(Council[i])
{
src/bindings/scripts/scripts/zone/gruuls_lair/instance_gruuls_lair.cpp
+2 -2
View File
@@ -59,13 +59,13 @@ struct TRINITY_DLL_DECL instance_gruuls_lair : public ScriptedInstance
MaulgarDoor = 0;
GruulDoor = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS) return true;
return false;
src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+1 -1
View File
@@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
if(SpellEntry *nova = GET_SPELL(SPELL_BURNING_NOVA))
{
uint8 eff_mask=0;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!nova->Effect[i])
continue;
src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL instance_blood_furnace : public ScriptedInstance
PrisonCell7GUID = 0;
PrisonCell8GUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ struct TRINITY_DLL_DECL instance_ramparts : public ScriptedInstance
m_uiChestNGUID = 0;
m_uiChestHGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
m_uiEncounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+2 -2
View File
@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
void Initialize()
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
MagtheridonGUID = 0;
@@ -66,7 +66,7 @@ struct TRINITY_DLL_DECL instance_magtheridons_lair : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS) return true;
return false;
}
src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
+1 -1
View File
@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL boss_warchief_kargath_bladefistAI : public ScriptedAI
{
Unit* target = NULL;
for(uint8 i = 0; i < summoned; i++)
for(uint8 i = 0; i < summoned; ++i)
{
switch(rand()%3)
{
src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ struct TRINITY_DLL_DECL instance_shattered_halls : public ScriptedInstance
nethekurseGUID = 0;
nethekurseDoorGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/karazhan/boss_moroes.cpp
+3 -3
View File
@@ -62,7 +62,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
{
boss_moroesAI(Creature *c) : ScriptedAI(c)
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
AddId[i] = 0;
}
@@ -185,7 +185,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
}
}else
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
Creature *pCreature = m_creature->SummonCreature(AddId[i], Locations[i][0], Locations[i][1], POS_Z, Locations[i][2], TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000);
if (pCreature)
@@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
bool isAddlistEmpty()
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
if(AddId[i] == 0)
return true;
src/bindings/scripts/scripts/zone/karazhan/boss_shade_of_aran.cpp
+3 -3
View File
@@ -430,7 +430,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
{
ElementalsSpawned = true;
for (uint32 i = 0; i < 4; i++)
for (uint32 i = 0; i < 4; ++i)
{
if (Creature* pUnit = m_creature->SummonCreature(CREATURE_WATER_ELEMENTAL, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 90000))
{
@@ -444,7 +444,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
if(BerserkTimer < diff)
{
for (uint32 i = 0; i < 5; i++)
for (uint32 i = 0; i < 5; ++i)
{
if (Creature* pUnit = m_creature->SummonCreature(CREATURE_SHADOW_OF_ARAN, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000))
{
@@ -467,7 +467,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
if (FlameWreathCheckTime < diff)
{
for (uint32 i = 0; i < 3; i++)
for (uint32 i = 0; i < 3; ++i)
{
if (!FlameWreathTarget[i])
continue;
src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
std::list<HostilReference*>& m_threatlist = m_creature->getThreatManager().getThreatList();
std::list<HostilReference*>::iterator i = m_threatlist.begin();
for(i = m_threatlist.begin(); i != m_threatlist.end(); i++)
for(i = m_threatlist.begin(); i != m_threatlist.end(); ++i)
{
Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid());
if (pUnit && pUnit->isAlive())
src/bindings/scripts/scripts/zone/magisters_terrace/instance_magisters_terrace.cpp
+2 -2
View File
@@ -56,7 +56,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
void Initialize()
{
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; i++)
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
FelCrystals.clear();
@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; i++)
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS)
return true;
return false;
src/bindings/scripts/scripts/zone/molten_core/instance_molten_core.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
IsBossDied[7] = false;
IsBossDied[8] = false;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/nexus/nexus/boss_keristrasza.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ struct TRINITY_DLL_DECL boss_keristraszaAI : public ScriptedAI
GameObject *ContainmentSpheres[CONTAINMENT_SPHERES];
for(uint8 i = 0; i < CONTAINMENT_SPHERES; i++)
for(uint8 i = 0; i < CONTAINMENT_SPHERES; ++i)
{
ContainmentSpheres[i] = pInstance->instance->GetGameObject(ContainmentSphereGUIDs[i]);
if(!ContainmentSpheres[i])
src/bindings/scripts/scripts/zone/nexus/nexus/boss_ormorok.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ struct TRINITY_DLL_DECL boss_ormorokAI : public ScriptedAI
SpikeXY[2][1] = BaseY+(SPIKE_DISTANCE*CrystalSpikes_Count*sin(BaseO-(M_PI/2)));
SpikeXY[3][0] = BaseX-(SPIKE_DISTANCE*CrystalSpikes_Count*cos(BaseO-(M_PI/2)));
SpikeXY[3][1] = BaseY-(SPIKE_DISTANCE*CrystalSpikes_Count*sin(BaseO-(M_PI/2)));
for (uint8 i = 0; i < 4; i++)
for (uint8 i = 0; i < 4; ++i)
Creature* Spike = m_creature->SummonCreature(MOB_CRYSTAL_SPIKE, SpikeXY[i][0], SpikeXY[i][1], BaseZ, 0, TEMPSUMMON_TIMED_DESPAWN, 7000);
if (++CrystalSpikes_Count >= 13)
CrystalSpikes = false;
src/bindings/scripts/scripts/zone/nexus/nexus/instance_nexus.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ struct TRINITY_DLL_DECL instance_nexus : public ScriptedInstance
void Initialize()
{
Anomalus = 0;
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; i++)
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/scarlet_monastery/instance_scarlet_monastery.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
VorrelGUID = 0;
DoorHighInquisitorGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/scholomance/boss_jandice_barov.cpp
+1 -1
View File
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
//Summon 10 Illusions attacking random gamers
Unit* target = NULL;
for(uint8 i = 0; i < 10;i++)
for(uint8 i = 0; i < 10; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if(target)
src/bindings/scripts/scripts/zone/scholomance/instance_scholomance.cpp
+2 -2
View File
@@ -63,10 +63,10 @@ struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance
GateBarovGUID = 0;
GateIlluciaGUID = 0;
for(uint8 i = 0; i < 6; i++)
for(uint8 i = 0; i < 6; ++i)
IsBossDied[i] = false;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/stratholme/boss_ramstein_the_gorger.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI
void JustDied(Unit* Killer)
{
for(uint8 i = 0; i < 30; i++)
for(uint8 i = 0; i < 30; ++i)
{
if(Creature* mob = m_creature->SummonCreature(C_MINDLESS_UNDEAD,3969.35+irand(-10,10),-3391.87+irand(-10,10),119.11,5.91,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000))
mob->AI()->AttackStart(m_creature->SelectNearestTarget(500));
src/bindings/scripts/scripts/zone/stratholme/instance_stratholme.cpp
+1 -1
View File
@@ -394,7 +394,7 @@ struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
{
if (Creature* pBaron = instance->GetCreature(baronGUID))
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
pBaron->SummonCreature(C_BLACK_GUARD,4032.84,-3390.24,119.73,4.71,TEMPSUMMON_TIMED_OR_DEAD_DESPAWN,1800000);
UpdateGoState(ziggurat4GUID,GO_STATE_ACTIVE,false);
src/bindings/scripts/scripts/zone/stratholme/stratholme.cpp
+1 -1
View File
@@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI
{
if (Tagged)
{
for(uint32 i = 1; i <= 4; i++)
for(uint32 i = 1; i <= 4; ++i)
{
float x,y,z;
m_creature->GetRandomPoint(m_creature->GetPositionX(),m_creature->GetPositionY(),m_creature->GetPositionZ(),20.0f,x,y,z);
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_eredar_twins.cpp
+1 -1
View File
@@ -303,7 +303,7 @@ struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
{
Unit* target = NULL;
Creature* temp = NULL;
for(uint8 i = 0;i<3;i++)
for(uint8 i = 0;i<3; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM, 0);
temp = DoSpawnCreature(MOB_SHADOW_IMAGE,0,0,0,0,TEMPSUMMON_CORPSE_DESPAWN,10000);
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_felmyst.cpp
+1 -1
View File
@@ -436,7 +436,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
}
Event = EVENT_NULL;
for(uint32 i = 1; i <= MaxTimer[Phase]; i++)
for(uint32 i = 1; i <= MaxTimer[Phase]; ++i)
{
if(Timer[i])
if(Timer[i] <= diff)
src/bindings/scripts/scripts/zone/sunwell_plateau/boss_kiljaeden.cpp
+1 -1
View File
@@ -544,7 +544,7 @@ struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
case 1: DoScriptText(SAY_KJ_REFLECTION2, m_creature); break;
}
DoCast(m_creature, SPELL_SINISTER_REFLECTION, true);
for(uint8 i = 0; i < 4; i++){
for(uint8 i = 0; i < 4; ++i){
float x,y,z;
Unit* target;
for(uint8 z = 0; z < 6; ++z){
src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/instance_arcatraz.cpp
+2 -2
View File
@@ -78,13 +78,13 @@ struct TRINITY_DLL_DECL instance_arcatraz : public ScriptedInstance
GoSphereGUID = 0;
MellicharGUID = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounter[i] == IN_PROGRESS)
return true;
src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_astromancer.cpp
+2 -2
View File
@@ -291,7 +291,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
Portals[2][0] = Portals[2][0]+7*i;
Portals[2][1] = Portal_Y(Portals[2][0], LARGE_PORTAL_RADIUS);
}
for (int i=0; i<=2; i++)
for (int i=0; i<=2; ++i)
{
if (Creature* Summoned = m_creature->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700))
{
@@ -310,7 +310,7 @@ struct TRINITY_DLL_DECL boss_high_astromancer_solarianAI : public ScriptedAI
if (Phase2_Timer < diff)
{
Phase = 3;
for (int i=0; i<=2; i++)
for (int i=0; i<=2; ++i)
for (int j=1; j<=4; j++)
SummonMinion(NPC_SOLARIUM_AGENT, Portals[i][0], Portals[i][1], Portals[i][2]);
src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_kaelthas.cpp
+6 -6
View File
@@ -334,7 +334,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
void PrepareAdvisors()
{
for(uint8 i = 0; i < MAX_ADVISORS; i++)
for(uint8 i = 0; i < MAX_ADVISORS; ++i)
{
if (Creature *pCreature = Unit::GetCreature((*m_creature), m_auiAdvisorGuid[i]))
{
@@ -458,7 +458,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
if (m_pInstance)
m_pInstance->SetData(DATA_KAELTHASEVENT, 0);
for(uint8 i = 0; i < MAX_ADVISORS; i++)
for(uint8 i = 0; i < MAX_ADVISORS; ++i)
{
if (Unit* pAdvisor = Unit::GetUnit((*m_creature), m_auiAdvisorGuid[i]))
pAdvisor->DealDamage(pAdvisor, pAdvisor->GetMaxHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false);
@@ -676,7 +676,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
Unit* Target = SelectUnit(SELECT_TARGET_RANDOM, 0);
Creature* Advisor;
for (uint32 i = 0; i < MAX_ADVISORS; i++)
for (uint32 i = 0; i < MAX_ADVISORS; ++i)
{
Advisor = (Unit::GetCreature((*m_creature), m_auiAdvisorGuid[i]));
@@ -763,7 +763,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
if (MindControl_Timer < diff)
{
if (m_creature->getThreatManager().getThreatList().size() >= 2)
for (uint32 i = 0; i < 3; i++)
for (uint32 i = 0; i < 3; ++i)
{
debug_log("SD2: Kael'Thas mind control not supported.");
//DoCast(pUnit, SPELL_MIND_CONTROL);
@@ -902,7 +902,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
}
// 2) At that point he will put a Gravity Lapse debuff on everyone
for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end();i++)
for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i)
{
if (Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()))
{
@@ -935,7 +935,7 @@ struct TRINITY_DLL_DECL boss_kaelthasAI : public ScriptedAI
case 3:
//Remove flight
for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end();i++)
for (i = m_creature->getThreatManager().getThreatList().begin(); i!= m_creature->getThreatManager().getThreatList().end(); ++i)
{
if (Unit* pUnit = Unit::GetUnit((*m_creature), (*i)->getUnitGuid()))
{
src/bindings/scripts/scripts/zone/tempest_keep/the_eye/instance_the_eye.cpp
+2 -2
View File
@@ -63,13 +63,13 @@ struct TRINITY_DLL_DECL instance_the_eye : public ScriptedInstance
KaelthasEventPhase = 0;
AlarEventPhase = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS) return true;
return false;
src/bindings/scripts/scripts/zone/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_pathaleon_the_calculatorAI : public ScriptedAI
if(Summon_Timer < diff)
{
for(uint8 i = 0; i < 3;i++)
for(uint8 i = 0; i < 3; ++i)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Wraith = m_creature->SummonCreature(21062,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_bug_trio.cpp
+1 -1
View File
@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL boss_yaujAI : public ScriptedAI
pInstance->SetData(DATA_BUG_TRIO_DEATH, 1);
}
for(uint8 i = 0; i < 10;i++)
for(uint8 i = 0; i < 10; ++i)
{
Unit* target = SelectUnit(SELECT_TARGET_RANDOM,0);
Creature* Summoned = m_creature->SummonCreature(15621,m_creature->GetPositionX(), m_creature->GetPositionY(), m_creature->GetPositionZ(),0,TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN,90000);
src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_twinemperors.cpp
+2 -2
View File
@@ -418,7 +418,7 @@ struct TRINITY_DLL_DECL boss_veknilashAI : public boss_twinemperorsAI
(target->AI())->AttackStart(m_creature->getThreatManager().getHostilTarget());
SpellEntry *spell = GET_SPELL(SPELL_MUTATE_BUG);
uint8 eff_mask=0;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!spell->Effect[i])
continue;
@@ -503,7 +503,7 @@ struct TRINITY_DLL_DECL boss_veklorAI : public boss_twinemperorsAI
target->setFaction(14);
SpellEntry *spell = GET_SPELL(SPELL_EXPLODEBUG);
uint8 eff_mask=0;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!spell->Effect[i])
continue;
src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
+8 -8
View File
@@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
{
if (c==m_creature)
return;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (nearby[i] == c)
return;
@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
void GiveBuddyMyList(Creature *c)
{
aqsentinelAI *cai = CAST_AI(aqsentinelAI, (c)->AI());
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
if (nearby[i] && nearby[i]!=c)
cai->AddBuddyToList(nearby[i]);
cai->AddBuddyToList(m_creature);
@@ -127,14 +127,14 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
void SendMyListToBuddies()
{
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
if (nearby[i])
GiveBuddyMyList(nearby[i]);
}
void CallBuddiesToAttack(Unit *who)
{
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
Creature *c = nearby[i];
if (c)
@@ -163,9 +163,9 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
int pickAbilityRandom(bool *chosenAbilities)
{
for (int t = 0; t < 2; t++)
for (int t = 0; t < 2; ++t)
{
for (int i = !t ? (rand()%9) : 0; i < 9; i++)
for (int i = !t ? (rand()%9) : 0; i < 9; ++i)
{
if (!chosenAbilities[i])
{
@@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
{
if (!m_creature->isDead())
{
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!nearby[i])
continue;
@@ -224,7 +224,7 @@ struct TRINITY_DLL_DECL aqsentinelAI : public ScriptedAI
{
const SpellEntry *spell = GetSpellStore()->LookupEntry(id);
uint8 eff_mask=0;
for (int i=0; i<3; i++)
for (int i=0; i<3; ++i)
{
if (!spell->Effect[i])
continue;
src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/instance_utgarde_keep.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ struct TRINITY_DLL_DECL instance_utgarde_keep : public ScriptedInstance
Dalronn =0;
Ingvar =0;
for(uint8 i= 0; i < 3; i++)
for(uint8 i= 0; i < 3; ++i)
{
forge_bellow[i] = 0;
forge_fire[i] = 0;
src/bindings/scripts/scripts/zone/utgarde_keep/utgarde_keep/utgarde_keep.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ struct TRINITY_DLL_DECL npc_dragonflayer_forge_masterAI : public ScriptedAI
float diff = 30.0f;
int near_f = 0;
for(uint8 i = 0; i < 3 ; i++)
for(uint8 i = 0; i < 3 ; ++i)
{
GameObject* temp;
temp = m_creature->FindNearestGameObject(entry_search[i],30);
src/bindings/scripts/scripts/zone/vault_of_archavon/boss_emalon.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL boss_emalonAI : public ScriptedAI
void SummonAllMinions()
{
if(MinionList.empty())
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
SummonMinion(m_creature, MinionLocation[i].x, MinionLocation[i].y, MinionLocation[i].z, MinionLocation[i].o);
}
src/bindings/scripts/scripts/zone/vault_of_archavon/instance_vault_of_archavon.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ struct TRINITY_DLL_DECL instance_archavon : public ScriptedInstance
Archavon = 0;
Emalon = 0;
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; i++)
for(uint8 i = 0; i < NUMBER_OF_ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/wailing_caverns/instance_wailing_caverns.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ struct TRINITY_DLL_DECL instance_wailing_caverns : public ScriptedInstance
yelled = false;
NaralexGUID = 0;
for (uint8 i = 0; i < ENCOUNTERS; i++)
for (uint8 i = 0; i < ENCOUNTERS; ++i)
Encounter[i] = NOT_STARTED;
}
src/bindings/scripts/scripts/zone/zulaman/boss_akilzon.cpp
+3 -3
View File
@@ -101,7 +101,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
CloudGUID = 0;
CycloneGUID = 0;
DespawnSummons();
for(uint8 i = 0; i < 8; i++)
for(uint8 i = 0; i < 8; ++i)
BirdGUIDs[i] = 0;
StormCount = 0;
@@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
void DespawnSummons()
{
for (uint8 i = 0; i < 8; i++)
for (uint8 i = 0; i < 8; ++i)
{
Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]);
if(bird && bird->isAlive())
@@ -336,7 +336,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
float x, y, z;
m_creature->GetPosition(x, y, z);
for (uint8 i = 0; i < 8; i++)
for (uint8 i = 0; i < 8; ++i)
{
Unit* bird = Unit::GetUnit(*m_creature,BirdGUIDs[i]);
if(!bird)//they despawned on die
src/bindings/scripts/scripts/zone/zulaman/boss_janalai.cpp
+3 -3
View File
@@ -149,7 +149,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
isFlameBreathing = false;
for(uint8 i = 0; i < 40; i++)
for(uint8 i = 0; i < 40; ++i)
FireBombGUIDs[i] = 0;
HatchAllEggs(1);
@@ -194,7 +194,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
{
uint8 WallNum;
Creature* wall = NULL;
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
if(i == 0 || i == 2)
WallNum = 3;
@@ -215,7 +215,7 @@ struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
void SpawnBombs()
{
float dx, dy;
for( int i(0); i < 40; i++)
for( int i(0); i < 40; ++i)
{
dx =(rand()%(area_dx))-(area_dx/2);
dy =(rand()%(area_dy))-(area_dy/2);
src/bindings/scripts/scripts/zone/zulaman/boss_zuljin.cpp
+3 -3
View File
@@ -287,7 +287,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
void SpawnAdds()
{
Creature *pCreature = NULL;
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
pCreature = m_creature->SummonCreature(SpiritInfo[i].entry, SpiritInfo[i].x, SpiritInfo[i].y, SpiritInfo[i].z, SpiritInfo[i].orient, TEMPSUMMON_DEAD_DESPAWN, 0);
if(pCreature)
@@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
void DespawnAdds()
{
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
Unit* Temp = NULL;
if(SpiritGUID[i])
@@ -355,7 +355,7 @@ struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
{
m_creature->GetMotionMaster()->Clear();
m_creature->CastSpell(m_creature, SPELL_ENERGY_STORM, true); // enemy aura
for(uint8 i = 0; i < 4; i++)
for(uint8 i = 0; i < 4; ++i)
{
Creature* Vortex = DoSpawnCreature(CREATURE_FEATHER_VORTEX, 0, 0, 0, 0, TEMPSUMMON_CORPSE_DESPAWN, 0);
if(Vortex)
src/bindings/scripts/scripts/zone/zulaman/instance_zulaman.cpp
+3 -3
View File
@@ -90,15 +90,15 @@ struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
BossKilled = 0;
ChestLooted = 0;
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
Encounters[i] = NOT_STARTED;
for(uint8 i = 0; i < RAND_VENDOR; i++)
for(uint8 i = 0; i < RAND_VENDOR; ++i)
RandVendor[i] = NOT_STARTED;
}
bool IsEncounterInProgress() const
{
for(uint8 i = 0; i < ENCOUNTERS; i++)
for(uint8 i = 0; i < ENCOUNTERS; ++i)
if(Encounters[i] == IN_PROGRESS) return true;
return false;
src/bindings/scripts/scripts/zone/zulgurub/boss_hazzarah.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI
//We will summon 3 illusions that will spawn on a random gamer and attack this gamer
//We will just use one model for the beginning
Unit* target = NULL;
for(uint8 i = 0; i < 3;i++)
for(uint8 i = 0; i < 3; ++i)
{
target = SelectUnit(SELECT_TARGET_RANDOM,0);
if(!target)
src/bindings/scripts/scripts/zone/zulgurub/boss_venoxis.cpp
+1 -1
View File
@@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
if (HolyNova_Timer < diff)
{
TargetInRange = 0;
for(uint8 i=0; i<10; i++)
for(uint8 i=0; i<10; ++i)
{
if (Unit* target = SelectUnit(SELECT_TARGET_TOPAGGRO,i))
if(m_creature->IsWithinMeleeRange(target))