diff options
| author | Spp <none@none> | 2010-04-07 23:25:02 +0200 |
|---|---|---|
| committer | Spp <none@none> | 2010-04-07 23:25:02 +0200 |
| commit | 2454c290b84e04bd0321ca94e0be8c8dc7eedbe8 (patch) | |
| tree | b744629b9fc3004bcb717c5f95a10724df3a6a62 /src/scripts/eastern_kingdoms | |
| parent | 49d05ba9aa1cd5c1f3ae96546283e6d03a037ff7 (diff) | |
Code Style (game + scripts only):
"==" --> " == " (when needed)
--HG--
branch : trunk
Diffstat (limited to 'src/scripts/eastern_kingdoms')
6 files changed, 20 insertions, 20 deletions
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp index df93b22541c..f2e7c97f251 100644 --- a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp +++ b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp @@ -938,7 +938,7 @@ struct npc_marshal_reginald_windsorAI : public npc_escortAI void UpdateAI(const uint32 diff) { if (pInstance->GetData(DATA_QUEST_JAIL_BREAK) == ENCOUNTER_STATE_NOT_STARTED) return; - if (wp==7) + if (wp == 7) { if (!pInstance->GetData(DATA_GATE_J) && pInstance->GetData(DATA_JAZ) == ENCOUNTER_STATE_NOT_STARTED) { @@ -951,7 +951,7 @@ struct npc_marshal_reginald_windsorAI : public npc_escortAI pInstance->SetData(DATA_JAZ,ENCOUNTER_STATE_ENDED); } } - else if (wp==11) + else if (wp == 11) { if (!pInstance->GetData(DATA_GATE_S) && pInstance->GetData(DATA_SHILL) == ENCOUNTER_STATE_NOT_STARTED) { @@ -964,7 +964,7 @@ struct npc_marshal_reginald_windsorAI : public npc_escortAI SetEscortPaused(false); } } - else if (wp==20) + else if (wp == 20) { if (!pInstance->GetData(DATA_GATE_C) && pInstance->GetData(DATA_CREST) == ENCOUNTER_STATE_NOT_STARTED) { @@ -978,7 +978,7 @@ struct npc_marshal_reginald_windsorAI : public npc_escortAI pInstance->SetData(DATA_CREST,ENCOUNTER_STATE_ENDED); } } - if (pInstance->GetData(DATA_TOBIAS)==ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); + if (pInstance->GetData(DATA_TOBIAS) == ENCOUNTER_STATE_OBJECTIVE_COMPLETED) SetEscortPaused(false); npc_escortAI::UpdateAI(diff); } }; diff --git a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp index 50bbeaec1f5..b5e980e872d 100644 --- a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp +++ b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp @@ -62,7 +62,7 @@ struct npc_converted_sentryAI : public ScriptedAI if (Timer <= diff) { uint32 i = urand(1,2); - if (i==1) + if (i == 1) DoScriptText(SAY_CONVERTED_1, m_creature); else DoScriptText(SAY_CONVERTED_2, m_creature); diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp index 218f094f4c4..a5b8f55b705 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp @@ -94,7 +94,7 @@ struct boss_midnightAI : public ScriptedAI if (Unit *pAttumen = Unit::GetUnit(*m_creature, Attumen)) Mount(pAttumen); } - else if (Phase ==3) + else if (Phase == 3) { if (Mount_Timer) { diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp index 575f7db1552..41a9f2325e1 100644 --- a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp +++ b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp @@ -207,7 +207,7 @@ struct boss_netherspiteAI : public ScriptedAI } } // aggro target if Red Beam - if (j==RED_PORTAL && m_creature->getVictim() != pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) + if (j == RED_PORTAL && m_creature->getVictim() != pTarget && pTarget->GetTypeId() == TYPEID_PLAYER) m_creature->getThreatManager().addThreat(pTarget, 100000.0f+DoGetThreat(m_creature->getVictim())); } } diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp index 6357c156152..8140b3741ff 100644 --- a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp +++ b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp @@ -99,7 +99,7 @@ struct instance_uldaman : public ScriptedInstance for (std::vector<uint64>::const_iterator i = stoneKeeper.begin(); i != stoneKeeper.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); - if (!pTarget || !pTarget->isAlive() || pTarget->getFaction()==14) + if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) continue; pTarget->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_DISABLE_MOVE); pTarget->setFaction(14); @@ -119,7 +119,7 @@ struct instance_uldaman : public ScriptedInstance for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i) { Creature *pTarget = instance->GetCreature(*i); - if (!pTarget || !pTarget->isAlive() || pTarget->getFaction()==14) + if (!pTarget || !pTarget->isAlive() || pTarget->getFaction() == 14) continue; archaedas->CastSpell(pTarget, SPELL_AWAKEN_VAULT_WALKER, true); pTarget->CastSpell(pTarget, SPELL_ARCHAEDAS_AWAKEN,true); @@ -216,19 +216,19 @@ struct instance_uldaman : public ScriptedInstance void SetData (uint32 type, uint32 data) { //error_log ("SetData: data = %d", data); - if (data==0) OpenDoor (altarOfTheKeeperTempleDoor); - if (data==0) OpenDoor (archaedasTempleDoor); - if (data==3) OpenDoor (ancientVaultDoor); - if (data==1) ActivateStoneKeepers(); - if (data==2) ActivateWallMinions(); - if (data==4) DeActivateMinions(); - if (data==5) RespawnMinions(); + if (data == 0) OpenDoor (altarOfTheKeeperTempleDoor); + if (data == 0) OpenDoor (archaedasTempleDoor); + if (data == 3) OpenDoor (ancientVaultDoor); + if (data == 1) ActivateStoneKeepers(); + if (data == 2) ActivateWallMinions(); + if (data == 4) DeActivateMinions(); + if (data == 5) RespawnMinions(); } void SetData64 (uint32 type, uint64 data) { // Archaedas - if (type==0) + if (type == 0) { ActivateArchaedas (data); } diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp index 2d374a63e50..15e7c080968 100644 --- a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp +++ b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp @@ -59,13 +59,13 @@ EndScriptData */ #define SOUND_INTRO 12090 //Spells: -// ====== Troll Form +//====== Troll Form #define SPELL_WHIRLWIND 17207 #define SPELL_GRIEVOUS_THROW 43093 // remove debuff after full healed -// ====== Bear Form +//====== Bear Form #define SPELL_CREEPING_PARALYSIS 43095 // should cast on the whole raid #define SPELL_OVERPOWER 43456 // use after melee attack dodged -// ====== Eagle Form +//====== Eagle Form #define SPELL_ENERGY_STORM 43983 // enemy area aura, trigger 42577 #define SPELL_ZAP_INFORM 42577 #define SPELL_ZAP_DAMAGE 43137 // 1250 damage |
