mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 17:05:44 +01:00
Code Style (game + scripts only):
"!=" --> " != " (when needed) " !=" --> " !=" "!= " --> "!= " --HG-- branch : trunk
This commit is contained in:
@@ -170,7 +170,7 @@ struct boss_netherspiteAI : public ScriptedAI
|
||||
Map::PlayerList const& players = map->GetPlayers();
|
||||
|
||||
// get the best suitable target
|
||||
for (Map::PlayerList::const_iterator i = players.begin(); i!=players.end(); ++i)
|
||||
for (Map::PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
|
||||
{
|
||||
Player* p = i->getSource();
|
||||
if (p && p->isAlive() // alive
|
||||
|
||||
@@ -475,9 +475,9 @@ struct boss_aranAI : public ScriptedAI
|
||||
void SpellHit(Unit* pAttacker, const SpellEntry* Spell)
|
||||
{
|
||||
//We only care about inturrupt effects and only if they are durring a spell currently being casted
|
||||
if ((Spell->Effect[0]!=SPELL_EFFECT_INTERRUPT_CAST &&
|
||||
Spell->Effect[1]!=SPELL_EFFECT_INTERRUPT_CAST &&
|
||||
Spell->Effect[2]!=SPELL_EFFECT_INTERRUPT_CAST) || !m_creature->IsNonMeleeSpellCasted(false))
|
||||
if ((Spell->Effect[0] != SPELL_EFFECT_INTERRUPT_CAST &&
|
||||
Spell->Effect[1] != SPELL_EFFECT_INTERRUPT_CAST &&
|
||||
Spell->Effect[2] != SPELL_EFFECT_INTERRUPT_CAST) || !m_creature->IsNonMeleeSpellCasted(false))
|
||||
return;
|
||||
|
||||
//Inturrupt effect
|
||||
|
||||
@@ -134,7 +134,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->isDead() || pTarget->getFaction()!=14)
|
||||
if (!pTarget || pTarget->isDead() || pTarget->getFaction() != 14)
|
||||
continue;
|
||||
pTarget->setDeathState(JUST_DIED);
|
||||
pTarget->RemoveCorpse();
|
||||
@@ -144,7 +144,7 @@ struct instance_uldaman : public ScriptedInstance
|
||||
for (std::vector<uint64>::const_iterator i = vaultWalker.begin(); i != vaultWalker.end(); ++i)
|
||||
{
|
||||
Creature *pTarget = instance->GetCreature(*i);
|
||||
if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14)
|
||||
if (!pTarget || pTarget->isDead() || pTarget->getFaction() != 14)
|
||||
continue;
|
||||
pTarget->setDeathState(JUST_DIED);
|
||||
pTarget->RemoveCorpse();
|
||||
@@ -154,7 +154,7 @@ struct instance_uldaman : public ScriptedInstance
|
||||
for (std::vector<uint64>::const_iterator i = earthenGuardian.begin(); i != earthenGuardian.end(); ++i)
|
||||
{
|
||||
Creature *pTarget = instance->GetCreature(*i);
|
||||
if (!pTarget || pTarget->isDead() || pTarget->getFaction()!=14)
|
||||
if (!pTarget || pTarget->isDead() || pTarget->getFaction() != 14)
|
||||
continue;
|
||||
pTarget->setDeathState(JUST_DIED);
|
||||
pTarget->RemoveCorpse();
|
||||
|
||||
@@ -67,7 +67,7 @@ bool GossipSelectWithCode_example_gossip_codebox(Player* pPlayer, Creature* pCre
|
||||
switch (uiAction)
|
||||
{
|
||||
case GOSSIP_ACTION_INFO_DEF+1:
|
||||
if (std::strcmp(sCode, pPlayer->GetName())!=0)
|
||||
if (std::strcmp(sCode, pPlayer->GetName()) != 0)
|
||||
{
|
||||
DoScriptText(SAY_WRONG, pCreature);
|
||||
pCreature->CastSpell(pPlayer, SPELL_POLYMORPH, true);
|
||||
|
||||
@@ -531,7 +531,7 @@ struct boss_veklorAI : public boss_twinemperorsAI
|
||||
if (ArcaneBurst_Timer <= diff)
|
||||
{
|
||||
Unit *mvic;
|
||||
if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true))!=NULL)
|
||||
if ((mvic=SelectTarget(SELECT_TARGET_NEAREST, 0, NOMINAL_MELEE_RANGE, true)) != NULL)
|
||||
{
|
||||
DoCast(mvic, SPELL_ARCANEBURST);
|
||||
ArcaneBurst_Timer = 5000;
|
||||
|
||||
@@ -205,7 +205,7 @@ struct boss_volazjAI : public ScriptedAI
|
||||
Summons.Despawn(summon);
|
||||
|
||||
// Check if all summons in this phase killed
|
||||
for (SummonList::const_iterator iter = Summons.begin(); iter!=Summons.end(); ++iter)
|
||||
for (SummonList::const_iterator iter = Summons.begin(); iter != Summons.end(); ++iter)
|
||||
{
|
||||
if (Creature *visage = Unit::GetCreature(*m_creature, *iter))
|
||||
{
|
||||
|
||||
@@ -145,7 +145,7 @@ struct boss_palehoofAI : public ScriptedAI
|
||||
|
||||
void UpdateAI(const uint32 diff)
|
||||
{
|
||||
if (currentPhase!=PHASE_GORTOK_PALEHOOF)
|
||||
if (currentPhase != PHASE_GORTOK_PALEHOOF)
|
||||
return;
|
||||
//Return since we have no target
|
||||
if (!UpdateVictim())
|
||||
|
||||
@@ -191,7 +191,7 @@ struct boss_vazrudenAI : public ScriptedAI
|
||||
|
||||
void KilledUnit(Unit* who)
|
||||
{
|
||||
if (who && who->GetEntry()!=ENTRY_VAZRUDEN)
|
||||
if (who && who->GetEntry() != ENTRY_VAZRUDEN)
|
||||
DoScriptText(RAND(SAY_KILL_1,SAY_KILL_2), m_creature);
|
||||
}
|
||||
|
||||
|
||||
@@ -326,7 +326,7 @@ struct boss_high_astromancer_solarianAI : public ScriptedAI
|
||||
m_creature->GetMap()->CreatureRelocation(m_creature, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O);
|
||||
|
||||
for (int j=0; j <= 2; j++)
|
||||
if (j!=i)
|
||||
if (j != i)
|
||||
SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
|
||||
|
||||
m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
|
||||
Reference in New Issue
Block a user