[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)

This commit is contained in:
Spp
2011-09-15 14:12:57 +02:00
parent 9006e4e8dc
commit af05915b9e
431 changed files with 3131 additions and 3131 deletions
@@ -71,7 +71,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
bool InciteChaos;
uint32 InciteChaos_Timer;
@@ -133,8 +133,8 @@ public:
{
DoCast(me, SPELL_INCITE_CHAOS);
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (target && target->GetTypeId() == TYPEID_PLAYER)
@@ -153,7 +153,7 @@ public:
Intro = false;
}
InstanceScript *pInstance;
InstanceScript* pInstance;
bool Intro, HelpYell;
bool sumportals;
@@ -79,8 +79,8 @@ public:
void SonicBoomEffect()
{
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (target && target->GetTypeId() == TYPEID_PLAYER)
@@ -98,7 +98,7 @@ public:
void EnterCombat(Unit* /*who*/) { }
// Sonic Boom instant damage (needs core fix instead of this)
void SpellHitTarget(Unit* target, const SpellInfo *spell)
void SpellHitTarget(Unit* target, const SpellInfo* spell)
{
if (target && target->isAlive() && spell && spell->Id == uint32(SPELL_SONIC_BOOM_EFFECT))
me->DealDamage(target, (target->GetHealth()*90)/100, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NATURE, spell);
@@ -142,13 +142,13 @@ public:
void CastBloodboil()
{
// Get the Threat List
std::list<HostileReference *> m_threatlist = me->getThreatManager().getThreatList();
std::list<HostileReference*> m_threatlist = me->getThreatManager().getThreatList();
if (m_threatlist.empty()) // He doesn't have anyone in his threatlist, useless to continue
return;
std::list<Unit* > targets;
std::list<HostileReference *>::const_iterator itr = m_threatlist.begin();
std::list<Unit*> targets;
std::list<HostileReference*>::const_iterator itr = m_threatlist.begin();
for (; itr!= m_threatlist.end(); ++itr) //store the threat list in a different container
{
Unit* target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
@@ -163,10 +163,10 @@ public:
targets.resize(5);
//Aura each player in the targets list with Bloodboil. Aura code copied+pasted from Aura command in Level3.cpp
/*SpellInfo const *spellInfo = sSpellMgr->GetSpellInfo(SPELL_BLOODBOIL);
/*SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(SPELL_BLOODBOIL);
if (spellInfo)
{
for (std::list<Unit* >::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
for (std::list<Unit*>::const_iterator itr = targets.begin(); itr != targets.end(); ++itr)
{
Unit* target = *itr;
if (!target) return;
@@ -176,7 +176,7 @@ public:
if (eff >= TOTAL_SPELL_EFFECTS)
continue;
Aura *Aur = new Aura(spellInfo, i, target, target, target);
Aura* Aur = new Aura(spellInfo, i, target, target, target);
target->AddAura(Aur);
}
}
@@ -454,7 +454,7 @@ public:
};
/************************************** Illidan's AI ***************************************/
/************************************** Illidan's AI* **************************************/
class boss_illidan_stormrage : public CreatureScript
{
public:
@@ -585,7 +585,7 @@ public:
done_by->AddThreat(me, -(3*(float)damage)/4); // do not let maiev tank him
}
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (spell->Id == SPELL_GLAIVE_RETURNS) // Re-equip our warblades!
{
@@ -1138,9 +1138,9 @@ public:
};
/********************************** End of Illidan AI ******************************************/
/********************************** End of Illidan AI* *****************************************/
/******* Functions and vars for Akama's AI ******/
/******* Functions and vars for Akama's AI* *****/
class boss_maiev_shadowsong : public CreatureScript
{
public:
@@ -2163,7 +2163,7 @@ public:
{
blade_of_azzinothAI(Creature* c) : NullCreatureAI(c) {}
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (spell->Id == SPELL_THROW_GLAIVE2 || spell->Id == SPELL_THROW_GLAIVE)
me->SetDisplayId(21431);//appear when hit by Illidan's glaive
@@ -536,7 +536,7 @@ public:
}
}
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (me->GetCurrentSpell(CURRENT_GENERIC_SPELL))
for (uint8 i = 0; i < 3; ++i)
@@ -106,7 +106,7 @@ public:
DoScriptText(SAY_DEATH, me);
}
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
if (spell->Id == SPELL_HURL_SPINE && me->HasAura(SPELL_TIDAL_SHIELD))
{
@@ -896,7 +896,7 @@ public:
return sSpellMgr->GetSpellInfo(SPELL_REFLECTIVE_SHIELD_T);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect* aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
Unit* target = GetTarget();
if (dmgInfo.GetAttacker() == target)
@@ -911,7 +911,7 @@ public:
}
};
AuraScript *GetAuraScript() const
AuraScript* GetAuraScript() const
{
return new spell_boss_lady_malande_shield_AuraScript();
}
@@ -153,7 +153,7 @@ public:
c->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); //set it only once on Creature create (no need do intro if wiped)
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint64 ShieldGeneratorChannel[4];
@@ -451,8 +451,8 @@ public:
{
bool InMeleeRange = false;
Unit* target;
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
//if in melee range
@@ -592,7 +592,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 move;
uint32 phase;
float x, y, z;
@@ -694,7 +694,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 PoisonBolt_Timer;
uint32 Despawn_Timer;
@@ -770,7 +770,7 @@ public:
EnterEvadeMode();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 movement_timer;
uint32 ToxicSpore_Timer;
@@ -927,7 +927,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 Check_Timer;
bool Casted;
void Reset()
@@ -976,7 +976,7 @@ public:
bool OnUse(Player* player, Item* /*_Item*/, SpellCastTargets const& targets)
{
InstanceScript *pInstance = player->GetInstanceScript();
InstanceScript* pInstance = player->GetInstanceScript();
if (!pInstance)
{
@@ -180,7 +180,7 @@ public:
SpellBinderGUID[i] = 0;
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 Whirlwind_Timer;
uint32 ChaosBlast_Timer;
@@ -507,16 +507,16 @@ public:
//Summon Inner Demon
if (InnerDemons_Timer <= diff)
{
std::list<HostileReference *>& ThreatList = me->getThreatManager().getThreatList();
std::vector<Unit* > TargetList;
for (std::list<HostileReference *>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
std::list<HostileReference*>& ThreatList = me->getThreatManager().getThreatList();
std::vector<Unit*> TargetList;
for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
{
Unit* tempTarget = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (tempTarget && tempTarget->GetTypeId() == TYPEID_PLAYER && tempTarget->GetGUID() != me->getVictim()->GetGUID() && TargetList.size()<5)
TargetList.push_back(tempTarget);
}
//SpellInfo *spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER);
for (std::vector<Unit* >::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
//SpellInfo* spell = GET_SPELL(SPELL_INSIDIOUS_WHISPER);
for (std::vector<Unit*>::const_iterator itr = TargetList.begin(); itr != TargetList.end(); ++itr)
{
if ((*itr) && (*itr)->isAlive())
{
@@ -680,7 +680,7 @@ public:
AddedBanish = false;
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint64 leotherasGUID;
@@ -96,7 +96,7 @@ public:
InstanceScript* pInstance;
Map::PlayerList const *PlayerList;
Map::PlayerList const* PlayerList;
uint32 TidalWave_Timer;
uint32 WateryGrave_Timer;
@@ -63,7 +63,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 LightningCloud_Timer;
uint32 LungBurst_Timer;
@@ -65,7 +65,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 Shrink_Timer;
uint32 Saw_Blade_Timer;
@@ -59,7 +59,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
void Reset()
{
@@ -117,7 +117,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 Reflection_Timer;
uint32 Impale_Timer;
@@ -148,7 +148,7 @@ public:
DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me);
}
void SpellHit(Unit* /*caster*/, const SpellInfo *spell)
void SpellHit(Unit* /*caster*/, const SpellInfo* spell)
{
//hack :(
if (spell->Id == SPELL_WARLORDS_RAGE_PROC)
@@ -71,7 +71,7 @@ public:
pInstance = c->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 m_uiGrowth_Timer;
uint32 m_uiCaveIn_Timer;
@@ -438,7 +438,7 @@ class boss_kiggler_the_crazed : public CreatureScript
public:
boss_kiggler_the_crazed() : CreatureScript("boss_kiggler_the_crazed") { }
CreatureAI *GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_kiggler_the_crazedAI (creature);
}
@@ -560,7 +560,7 @@ class boss_blindeye_the_seer : public CreatureScript
public:
boss_blindeye_the_seer() : CreatureScript("boss_blindeye_the_seer") { }
CreatureAI *GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_blindeye_the_seerAI (creature);
}
@@ -670,7 +670,7 @@ class boss_krosh_firehand : public CreatureScript
public:
boss_krosh_firehand() : CreatureScript("boss_krosh_firehand") { }
CreatureAI *GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const
{
return new boss_krosh_firehandAI (creature);
}
@@ -766,9 +766,9 @@ public:
if (BlastWave_Timer <= diff)
{
Unit* target = NULL;
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
std::vector<Unit* > target_list;
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
std::vector<Unit*> target_list;
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
//15 yard radius minimum
@@ -249,7 +249,7 @@ class boss_kelidan_the_breaker : public CreatureScript
if (SpellInfo const* nova = sSpellMgr->GetSpellInfo(SPELL_BURNING_NOVA))
{
if (Aura * aura = Aura::TryRefreshStackOrCreate(nova, MAX_EFFECT_MASK, me, me))
if (Aura* aura = Aura::TryRefreshStackOrCreate(nova, MAX_EFFECT_MASK, me, me))
aura->ApplyForTargets();
}
@@ -95,7 +95,7 @@ class boss_nazan : public CreatureScript
uint32 Turn_Timer;
bool flight;
uint64 VazrudenGUID;
SpellInfo *liquid_fire;
SpellInfo* liquid_fire;
void Reset()
{
@@ -124,7 +124,7 @@ class mob_abyssal : public CreatureScript
FireBlast_Timer = 6000;
}
void SpellHit(Unit*, const SpellInfo *spell)
void SpellHit(Unit*, const SpellInfo* spell)
{
if (trigger == 2 && spell->Id == SPELL_BLAZE_TARGET)
{
@@ -86,7 +86,7 @@ class boss_alar : public CreatureScript
DefaultMoveSpeedRate = creature->GetSpeedRate(MOVE_RUN);
}
InstanceScript *pInstance;
InstanceScript* pInstance;
WaitEventType WaitEvent;
uint32 WaitTimer;
@@ -190,7 +190,7 @@ class boss_alar : public CreatureScript
}
}
void SpellHit(Unit*, const SpellInfo *spell)
void SpellHit(Unit*, const SpellInfo* spell)
{
if (spell->Id == SPELL_DIVE_BOMB_VISUAL)
{
@@ -474,7 +474,7 @@ class mob_ember_of_alar : public CreatureScript
creature->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
}
InstanceScript *pInstance;
InstanceScript* pInstance;
bool toDie;
void Reset()
@@ -91,7 +91,7 @@ class boss_high_astromancer_solarian : public CreatureScript
defaultsize = creature->GetFloatValue(OBJECT_FIELD_SCALE_X);
}
InstanceScript *pInstance;
InstanceScript* pInstance;
SummonList Summons;
uint8 Phase;
@@ -422,7 +422,7 @@ class mob_solarium_priest : public CreatureScript
pInstance = creature->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 healTimer;
uint32 holysmiteTimer;
@@ -119,9 +119,9 @@ class boss_void_reaver : public CreatureScript
if (ArcaneOrb_Timer <= diff)
{
Unit* target = NULL;
std::list<HostileReference *> t_list = me->getThreatManager().getThreatList();
std::vector<Unit* > target_list;
for (std::list<HostileReference *>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
std::list<HostileReference*> t_list = me->getThreatManager().getThreatList();
std::vector<Unit*> target_list;
for (std::list<HostileReference*>::const_iterator itr = t_list.begin(); itr!= t_list.end(); ++itr)
{
target = Unit::GetUnit(*me, (*itr)->getUnitGuid());
if (!target)
@@ -66,7 +66,7 @@ class boss_nethermancer_sepethrea : public CreatureScript
pInstance = creature->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 frost_attack_Timer;
uint32 arcane_blast_Timer;
@@ -188,7 +188,7 @@ class mob_ragin_flames : public CreatureScript
pInstance = creature->GetInstanceScript();
}
InstanceScript *pInstance;
InstanceScript* pInstance;
uint32 inferno_Timer;
uint32 flame_timer;
@@ -73,7 +73,7 @@ class boss_harbinger_skyriss : public CreatureScript
Intro = false;
}
InstanceScript *pInstance;
InstanceScript* pInstance;
bool Intro;
bool IsImage33;
@@ -157,7 +157,7 @@ public:
}
}
void SpellHit(Unit* caster, const SpellInfo *spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (spell->Id == SPELL_T_PHASE_MODULATOR && caster->GetTypeId() == TYPEID_PLAYER)
{
+3 -3
View File
@@ -64,7 +64,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
void SpellHit(Unit* Hitter, const SpellInfo *Spellkind)
void SpellHit(Unit* Hitter, const SpellInfo* Spellkind)
{
if (Spellkind->Id == 32001 && !Spawn)
{
@@ -838,7 +838,7 @@ public:
ScriptedAI::UpdateAI(diff);
}
void SpellHit(Unit* caster, const SpellInfo *spell)
void SpellHit(Unit* caster, const SpellInfo* spell)
{
if (caster->GetTypeId() == TYPEID_PLAYER)
{
@@ -925,7 +925,7 @@ class npc_corki : public CreatureScript
public:
npc_corki() : CreatureScript("npc_corki") { }
CreatureAI *GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_corkiAI(creature);
}
+5 -5
View File
@@ -100,7 +100,7 @@ public:
void EnterCombat(Unit* /*who*/) {}
/*void SpellHit(Unit* caster, const SpellInfo *spell)
/*void SpellHit(Unit* caster, const SpellInfo* spell)
{
//we have no way of telling the Creature was hit by spell -> got aura applied after 10-12 seconds
//then no way for the mobs to actually stop the shutdown as intended.
@@ -640,7 +640,7 @@ class at_commander_dawnforge : public AreaTriggerScript
public:
at_commander_dawnforge() : AreaTriggerScript("at_commander_dawnforge") { }
bool OnTrigger(Player* player, const AreaTriggerEntry * /*at*/)
bool OnTrigger(Player* player, const AreaTriggerEntry* /*at*/)
{
//if player lost aura or not have at all, we should not try start event.
if (!player->HasAura(SPELL_SUNFURY_DISGUISE))
@@ -681,7 +681,7 @@ class npc_professor_dabiri : public CreatureScript
public:
npc_professor_dabiri() : CreatureScript("npc_professor_dabiri") { }
bool OnQuestAccept(Player* player, Creature* creature, Quest const *quest)
bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest)
{
if (quest->GetQuestId() == QUEST_DIMENSIUS)
DoScriptText(WHISPER_DABIRI, creature, player);
@@ -782,7 +782,7 @@ public:
PlayerGUID = who->GetGUID();
}
void SpellHit(Unit* /*caster*/, const SpellInfo * /*spell*/)
void SpellHit(Unit* /*caster*/, const SpellInfo* /*spell*/)
{
DoCast(me, SPELL_DE_MATERIALIZE);
}
@@ -958,7 +958,7 @@ class npc_maxx_a_million_escort : public CreatureScript
public:
npc_maxx_a_million_escort() : CreatureScript("npc_maxx_a_million_escort") { }
CreatureAI *GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const
{
return new npc_maxx_a_million_escortAI(creature);
}
@@ -1379,7 +1379,7 @@ public:
if (!player)
return;
if (Group *EventGroup = player->GetGroup())
if (Group* EventGroup = player->GetGroup())
{
Player* GroupMember;
@@ -97,7 +97,7 @@ public:
{
if (Group* pGroup = CAST_PLR(done_by)->GetGroup())
{
for (GroupReference *itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
for (GroupReference* itr = pGroup->GetFirstMember(); itr != NULL; itr = itr->next())
{
Player* pGroupie = itr->getSource();
if (pGroupie &&