Core/Misc: Apply codestyle to multiple files (II)

This commit is contained in:
Spp committed 2013-01-14 11:12:58 +01:00
1 parent d75222feca
commit 0d5cb6af75
40 files changed
+194 -194

No files matched your search

+1 -1
View File
@@ -1352,7 +1352,7 @@ public:
{
Unit* unit = handler->getSelectedUnit();
Player* player = handler->GetSession()->GetPlayer();
if(unit && unit->GetTypeId() == TYPEID_PLAYER)
if (unit && unit->GetTypeId() == TYPEID_PLAYER)
player = unit->ToPlayer();
player->GetPhaseMgr().SendDebugReportToPlayer(handler->GetSession()->GetPlayer());
@@ -314,7 +314,7 @@ class npc_harrison_jones : public CreatureScript
me->SetEntry(NPC_HARRISON_JONES_2);
me->SetDisplayId(MODEL_HARRISON_JONES_2);
me->SetTarget(0);
me->SetByteValue(UNIT_FIELD_BYTES_1, 0,UNIT_STAND_STATE_DEAD);
me->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_DEAD);
me->SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_DEAD);
if (instance)
instance->SetData(DATA_GONGEVENT, DONE);
@@ -22,7 +22,7 @@
enum Yells
{
// Jin'do the Godbreaker
// Jin'do the Godbreaker
SAY_INTRO = 0,
SAY_AGGRO = 1,
EMOTE_SHADOWS_OF_HAKKAR = 2, // ID - 97172 Shadows of Hakkar
@@ -150,7 +150,7 @@ public:
{
// Set to combat automatically, Brann's event won't repeat
me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
events.SetPhase(PHASE_COMBAT);
events.SetPhase(PHASE_COMBAT);
ScheduleCombatEvents();
me->SetHomePosition(AnraphetActivatePos);
}
@@ -167,7 +167,7 @@ public:
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
Talk(ANRAPHET_SAY_DEATH);
if (Creature* brann = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_BRANN_0_GUID)))
brann->AI()->DoAction(ACTION_ANRAPHET_DIED);
@@ -209,12 +209,12 @@ public:
{
if ((events.GetPhaseMask() & PHASE_MASK_COMBAT) && (!UpdateVictim() || !CheckInRoom()))
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
@@ -313,7 +313,7 @@ class npc_alpha_beam : public CreatureScript
private:
InstanceScript* _instance;
};
CreatureAI* GetAI(Creature* creature) const
{
return GetHallsOfOriginationAI<npc_alpha_beamAI>(creature);
@@ -538,7 +538,7 @@ public:
Unit* caster = GetCaster();
float angle = float(rand_norm()) * static_cast<float>(2 * M_PI);
uint32 dist = caster->GetObjectSize() + GetSpellInfo()->Effects[effIndex].CalcRadius(GetCaster()) * (float)rand_norm();
float x = caster->GetPositionX() + dist * std::cos(angle);
float y = caster->GetPositionY() + dist * std::sin(angle);
float z = caster->GetMap()->GetHeight(x, y, caster->GetPositionZ());
@@ -45,14 +45,14 @@ enum Spells
SPELL_RAGING_SMASH = 83650,
SPELL_FLAME_BOLT = 77370,
SPELL_EARTH_SPIKE_WARN = 94974,
SPELL_PTAH_EXPLOSION = 75519,
SPELL_SANDSTORM = 75491,
SPELL_SUMMON_QUICKSAND = 75550, // Spell not in DBC, no SMSG_SPELL_START/GO for it
SPELL_BEETLE_BURROW = 75463,
SPELL_SUMMON_JEWELED_SCARAB = 75462,
SPELL_SUMMON_DUSTBONE_HORROR = 75521,
};
@@ -150,19 +150,19 @@ public:
{
events.SetPhase(PHASE_DISPERSE);
_hasDispersed = true;
me->AttackStop();
DoCast(me, SPELL_SANDSTORM);
SendWeather(WEATHER_STATE_LIGHT_SANDSTORM, 1.0f);
events.ScheduleEvent(EVENT_PTAH_EXPLODE, 6000, 0, PHASE_DISPERSE);
events.ScheduleEvent(EVENT_QUICKSAND, 10000, 0, PHASE_DISPERSE);
std::list<Creature*> stalkers;
GetCreatureListWithEntryInGrid(stalkers, me, NPC_BEETLE_STALKER, 100.0f);
std::list<Creature*> beetlers = stalkers;
Trinity::Containers::RandomResizeList(beetlers, 9); // Holds the summoners of Jeweled Scarab
for (std::list<Creature*>::iterator itr = beetlers.begin(); itr != beetlers.end(); ++itr)
{
stalkers.remove((*itr)); // Remove it to prevent a single trigger from spawning multiple npcs.
@@ -172,7 +172,7 @@ public:
}
Trinity::Containers::RandomResizeList(stalkers, 2); // Holds the summoners of Dustbone Horror
for (std::list<Creature*>::iterator itr = stalkers.begin(); itr != stalkers.end(); ++itr)
(*itr)->CastSpell((*itr), SPELL_SUMMON_DUSTBONE_HORROR);
}
@@ -194,7 +194,7 @@ public:
}
}
}
void EnterCombat(Unit* /*who*/)
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_ENGAGE, me, 1);
@@ -221,12 +221,12 @@ public:
{
if (!UpdateVictim() || !CheckInRoom())
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
@@ -256,11 +256,11 @@ public:
break;
}
}
if (events.GetPhaseMask() & PHASE_MASK_NORMAL) // Do not melee in the disperse phase
DoMeleeAttackIfReady();
}
protected:
bool _hasDispersed;
uint8 _summonDeaths;
@@ -53,7 +53,7 @@ enum Spells
SPELL_SHIELD_VISUAL_RIGHT = 83698,
SPELL_BEAM_OF_LIGHT_RIGHT = 76573,
SPELL_SHIELD_VISUAL_LEFT = 83697,
SPELL_BEAM_OF_LIGHT_LEFT = 74930,
@@ -196,12 +196,12 @@ public:
{
if (!UpdateVictim() || !CheckInRoom() || me->GetCurrentSpell(CURRENT_CHANNELED_SPELL) || _phase == PHASE_SHIELDED)
return;
events.Update(diff);
if (me->HasUnitState(UNIT_STATE_CASTING))
return;
while (uint32 eventId = events.ExecuteEvent())
{
switch (eventId)
@@ -225,22 +225,22 @@ public:
Unit* target = me->FindNearestCreature(NPC_SEARING_LIGHT, 100.0f);
if (!target)
break;
std::list<Creature*> stalkers;
GetCreatureListWithEntryInGrid(stalkers, me, NPC_CAVE_IN_STALKER, 100.0f);
stalkers.remove_if(Trinity::HeightDifferenceCheck(ObjectAccessor::GetGameObject(*me, instance->GetData64(DATA_ANHUUR_DOOR)), 5.0f, true));
if (stalkers.empty())
break;
stalkers.sort(Trinity::ObjectDistanceOrderPred(target));
// Get the closest statue face (any of its eyes)
Creature* eye1 = stalkers.front();
stalkers.remove(eye1); // Remove the eye.
stalkers.sort(Trinity::ObjectDistanceOrderPred(eye1)); // Find the second eye.
Creature* eye2 = stalkers.front();
eye1->CastSpell(eye1, SPELL_SEARING_LIGHT, true);
eye2->CastSpell(eye2, SPELL_SEARING_LIGHT, true);
break;
@@ -267,11 +267,11 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader
{
public:
spell_anhuur_shield_of_light() : SpellScriptLoader("spell_anhuur_shield_of_light") { }
class spell_anhuur_shield_of_light_SpellScript : public SpellScript
{
PrepareSpellScript(spell_anhuur_shield_of_light_SpellScript);
void FilterTargets(std::list<WorldObject*>& targets)
{
if (InstanceMap* instance = GetCaster()->GetMap()->ToInstanceMap())
@@ -288,13 +288,13 @@ class spell_anhuur_shield_of_light : public SpellScriptLoader
}
}
}
void Register()
{
OnObjectAreaTargetSelect += SpellObjectAreaTargetSelectFn(spell_anhuur_shield_of_light_SpellScript::FilterTargets, EFFECT_1, TARGET_UNIT_SRC_AREA_ENTRY);
}
};
SpellScript* GetSpellScript() const
{
return new spell_anhuur_shield_of_light_SpellScript();
@@ -305,11 +305,11 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader
{
public:
spell_anhuur_disable_beacon_beams() : SpellScriptLoader("spell_anhuur_disable_beacon_beams") { }
class spell_anhuur_disable_beacon_beams_SpellScript : public SpellScript
{
PrepareSpellScript(spell_anhuur_disable_beacon_beams_SpellScript);
void HandleScript(SpellEffIndex /*effIndex*/)
{
GetHitUnit()->RemoveAurasDueToSpell(GetEffectValue());
@@ -329,7 +329,7 @@ class spell_anhuur_disable_beacon_beams : public SpellScriptLoader
OnEffectHit += SpellEffectFn(spell_anhuur_disable_beacon_beams_SpellScript::Notify, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const
{
return new spell_anhuur_disable_beacon_beams_SpellScript();
@@ -37,7 +37,7 @@ enum Data
DATA_AMMUNAE,
DATA_SETESH,
DATA_RAJH,
// Temple Guardian Anhuur
DATA_ANHUUR_GUID,
DATA_ANHUUR_LEFT_BEACON,
@@ -56,7 +56,7 @@ enum Creatures
BOSS_TEMPLE_GUARDIAN_ANHUUR = 39425,
NPC_CAVE_IN_STALKER = 40183,
NPC_SEARING_LIGHT = 40283,
BOSS_EARTHRAGER_PTAH = 39428,
NPC_BEETLE_STALKER = 40459, // Summons both Jeweled Scarab and Dustbone Horror
NPC_JEWELED_SCARAB = 40458,
@@ -27,7 +27,7 @@
#include "WorldPacket.h"
#include "WorldSession.h"
DoorData const doorData[] =
DoorData const doorData[] =
{
{GO_ANHUURS_DOOR, DATA_TEMPLE_GUARDIAN_ANHUUR, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
{GO_ANHUURS_BRIDGE, DATA_TEMPLE_GUARDIAN_ANHUUR, DOOR_TYPE_PASSAGE, BOUNDARY_NONE },
@@ -51,7 +51,7 @@ class instance_halls_of_origination : public InstanceMapScript
struct instance_halls_of_origination_InstanceMapScript : public InstanceScript
{
instance_halls_of_origination_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
instance_halls_of_origination_InstanceMapScript(InstanceMap* map) : InstanceScript(map)
{
SetBossNumber(EncounterCount);
LoadDoorData(doorData);
@@ -66,7 +66,7 @@ class instance_halls_of_origination : public InstanceMapScript
SunMirrorGUID = 0;
_deadElementals = 0;
}
void OnGameObjectCreate(GameObject* go)
{
switch (go->GetEntry())
@@ -150,7 +150,7 @@ class instance_halls_of_origination : public InstanceMapScript
default:
break;
}
return 0;
}
@@ -173,7 +173,7 @@ class instance_halls_of_origination : public InstanceMapScript
case DATA_ANRAPHET_GUID:
return AnraphetGUID;
}
return 0;
}
@@ -269,7 +269,7 @@ class instance_halls_of_origination : public InstanceMapScript
uint64 SunMirrorGUID;
uint32 _deadElementals;
};
InstanceScript* GetInstanceScript(InstanceMap* map) const
{
return new instance_halls_of_origination_InstanceMapScript(map);
@@ -176,7 +176,7 @@ class boss_elder_nadox : public CreatureScript
}
}
if (me->HealthBelowPct(100 - AmountHealthModifier * 25))
if (me->HealthBelowPct(100 - AmountHealthModifier* 25))
{
Talk(EMOTE_HATCHES, me->GetGUID());
DoCast(me, SPELL_SUMMON_SWARM_GUARD);
@@ -298,7 +298,7 @@ public:
void FilterTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(GuardianCheck());
targets.remove_if (GuardianCheck());
}
void Register()
@@ -358,7 +358,7 @@ class boss_halion : public CreatureScript
if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_TWILIGHT_HALION)))
if (twilightHalion->isAlive())
twilightHalion->Kill(twilightHalion);
if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(DATA_HALION_CONTROLLER)))
if (controller->isAlive())
controller->Kill(controller);
@@ -554,7 +554,7 @@ class spell_paralyze_pinnacle : public SpellScriptLoader
void FilterTargets(std::list<WorldObject*>& unitList)
{
unitList.remove_if(RitualTargetCheck(GetCaster()));
unitList.remove_if (RitualTargetCheck(GetCaster()));
}
void Register()
+8 -8
View File
@@ -196,7 +196,7 @@ public:
if (caster->GetPrimaryTalentTree(caster->GetActiveSpec()) != TALENT_TREE_DRUID_BALANCE)
return;
switch(GetSpellInfo()->Id)
switch (GetSpellInfo()->Id)
{
case SPELL_DRUID_WRATH:
{
@@ -205,10 +205,10 @@ public:
if ((!caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_MARKER) && caster->HasAura(SPELL_DRUID_LUNAR_ECLIPSE_MARKER))
|| caster->GetPower(POWER_ECLIPSE) == 0)
{
caster->CastCustomSpell(caster,SPELL_DRUID_ECLIPSE_GENERAL_ENERGIZE,&energizeAmount,0,0,true);
caster->CastCustomSpell(caster, SPELL_DRUID_ECLIPSE_GENERAL_ENERGIZE, &energizeAmount, 0, 0, true);
// If the energize was due to 0 power, cast the eclipse marker aura
if (!caster->HasAura(SPELL_DRUID_LUNAR_ECLIPSE_MARKER))
caster->CastSpell(caster,SPELL_DRUID_LUNAR_ECLIPSE_MARKER,true);
caster->CastSpell(caster, SPELL_DRUID_LUNAR_ECLIPSE_MARKER, true);
}
// The energizing effect brought us out of the solar eclipse, remove the aura
if (caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE) && caster->GetPower(POWER_ECLIPSE) <= 0)
@@ -222,10 +222,10 @@ public:
if ((!caster->HasAura(SPELL_DRUID_LUNAR_ECLIPSE_MARKER) && caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_MARKER))
|| caster->GetPower(POWER_ECLIPSE) == 0)
{
caster->CastCustomSpell(caster,SPELL_DRUID_ECLIPSE_GENERAL_ENERGIZE,&energizeAmount,0,0,true);
caster->CastCustomSpell(caster, SPELL_DRUID_ECLIPSE_GENERAL_ENERGIZE, &energizeAmount, 0, 0, true);
// If the energize was due to 0 power, cast the eclipse marker aura
if (!caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_MARKER))
caster->CastSpell(caster,SPELL_DRUID_SOLAR_ECLIPSE_MARKER,true);
caster->CastSpell(caster, SPELL_DRUID_SOLAR_ECLIPSE_MARKER, true);
}
// The energizing effect brought us out of the lunar eclipse, remove the aura
if (caster->HasAura(SPELL_DRUID_LUNAR_ECLIPSE) && caster->GetPower(POWER_ECLIPSE) >= 0)
@@ -239,16 +239,16 @@ public:
|| caster->GetPower(POWER_ECLIPSE) == 0)
{
energizeAmount = GetSpellInfo()->Effects[effIndex].BasePoints; // 15
caster->CastCustomSpell(caster,SPELL_DRUID_STARSURGE_ENERGIZE,&energizeAmount,0,0,true);
caster->CastCustomSpell(caster, SPELL_DRUID_STARSURGE_ENERGIZE, &energizeAmount, 0, 0, true);
// If the energize was due to 0 power, cast the eclipse marker aura
if (!caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_MARKER))
caster->CastSpell(caster,SPELL_DRUID_SOLAR_ECLIPSE_MARKER,true);
caster->CastSpell(caster, SPELL_DRUID_SOLAR_ECLIPSE_MARKER, true);
}
else if (!caster->HasAura(SPELL_DRUID_SOLAR_ECLIPSE_MARKER) && caster->HasAura(SPELL_DRUID_LUNAR_ECLIPSE_MARKER))
{
energizeAmount = -GetSpellInfo()->Effects[effIndex].BasePoints; // -15
caster->CastCustomSpell(caster,SPELL_DRUID_STARSURGE_ENERGIZE,&energizeAmount,0,0,true);
caster->CastCustomSpell(caster, SPELL_DRUID_STARSURGE_ENERGIZE, &energizeAmount, 0, 0, true);
}
// The energizing effect brought us out of the lunar eclipse, remove the aura
if (caster->HasAura(SPELL_DRUID_LUNAR_ECLIPSE) && caster->GetPower(POWER_ECLIPSE) >= 0)
+4 -4
View File
@@ -465,7 +465,7 @@ class spell_mage_conjure_refreshment : public SpellScriptLoader
class spell_mage_blizzard : public SpellScriptLoader
{
public:
spell_mage_blizzard() : SpellScriptLoader("spell_mage_blizzard") { }
spell_mage_blizzard() : SpellScriptLoader("spell_mage_blizzard") { }
class spell_mage_blizzard_SpellScript : public SpellScript
{
@@ -498,7 +498,7 @@ class spell_mage_blizzard : public SpellScriptLoader
}
};
SpellScript *GetSpellScript() const
SpellScript* GetSpellScript() const
{
return new spell_mage_blizzard_SpellScript();
}
@@ -509,7 +509,7 @@ class spell_mage_blizzard : public SpellScriptLoader
class spell_mage_frostbolt : public SpellScriptLoader
{
public:
spell_mage_frostbolt() : SpellScriptLoader("spell_mage_frostbolt") { }
spell_mage_frostbolt() : SpellScriptLoader("spell_mage_frostbolt") { }
class spell_mage_frostbolt_SpellScript : public SpellScript
{
@@ -534,7 +534,7 @@ class spell_mage_frostbolt : public SpellScriptLoader
}
};
SpellScript *GetSpellScript() const
SpellScript* GetSpellScript() const
{
return new spell_mage_frostbolt_SpellScript();
}