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

Core: Clean up a lot of whitespace, and at the same time fix non-PCH building (again)

Browse Source
This commit is contained in:
click
2011-05-22 17:27:56 +02:00
parent 3643ca7c4a
commit 59f48c9bec
9 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
+11 -7
View File
@@ -18,6 +18,10 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "SpellScript.h" #include "SpellScript.h"
#include "Cell.h"
#include "CellImpl.h"
#include "GridNotifiers.h"
#include "GridNotifiersImpl.h"
#include "ulduar.h" #include "ulduar.h"
/* /*
@@ -238,7 +242,7 @@ class npc_iron_roots : public CreatureScript
me->SetInCombatWith(summoner); me->SetInCombatWith(summoner);
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Unit* target = ObjectAccessor::GetPlayer(*me, summonerGUID)) if (Unit* target = ObjectAccessor::GetPlayer(*me, summonerGUID))
{ {
@@ -314,12 +318,12 @@ class boss_freya : public CreatureScript
random[n] = false; random[n] = false;
} }
void KilledUnit(Unit* who) void KilledUnit(Unit* /*who*/)
{ {
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
} }
void DamageTaken(Unit* who, uint32& damage) void DamageTaken(Unit* /*who*/, uint32& damage)
{ {
if (damage >= me->GetHealth() && instance) if (damage >= me->GetHealth() && instance)
{ {
@@ -1118,7 +1122,7 @@ class npc_ancient_water_spirit : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0)) if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0))
{ {
@@ -1185,7 +1189,7 @@ class npc_storm_lasher : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0)) if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0))
{ {
@@ -1219,7 +1223,7 @@ class npc_snaplasher : public CreatureScript
uint8 waveCount; uint8 waveCount;
void UpdateAI(uint32 const diff) void UpdateAI(uint32 const /*diff*/)
{ {
if (!UpdateVictim()) if (!UpdateVictim())
return; return;
@@ -1230,7 +1234,7 @@ class npc_snaplasher : public CreatureScript
DoMeleeAttackIfReady(); DoMeleeAttackIfReady();
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0)) if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0))
{ {
src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
+18 -12
View File
@@ -17,6 +17,12 @@
#include "ScriptMgr.h" #include "ScriptMgr.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "Cell.h"
#include "CellImpl.h"
#include "GridNotifiers.h"
#include "GridNotifiersImpl.h"
#include "ulduar.h" #include "ulduar.h"
/* #TODO: Achievements /* #TODO: Achievements
@@ -253,7 +259,7 @@ class npc_ice_block : public CreatureScript
} }
} }
void DamageTaken(Unit* who, uint32& damage) void DamageTaken(Unit* who, uint32& /*damage*/)
{ {
if (Creature* Helper = ObjectAccessor::GetCreature(*me, targetGUID)) if (Creature* Helper = ObjectAccessor::GetCreature(*me, targetGUID))
{ {
@@ -309,7 +315,7 @@ class boss_hodir : public CreatureScript
FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true); FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true);
} }
void EnterCombat(Unit* who) void EnterCombat(Unit* /*who*/)
{ {
_EnterCombat(); _EnterCombat();
DoScriptText(SAY_AGGRO, me); DoScriptText(SAY_AGGRO, me);
@@ -329,13 +335,13 @@ class boss_hodir : public CreatureScript
events.ScheduleEvent(EVENT_BERSERK, 480000); events.ScheduleEvent(EVENT_BERSERK, 480000);
} }
void KilledUnit(Unit* who) void KilledUnit(Unit* /*who*/)
{ {
if (!urand(0, 3)) if (!urand(0, 3))
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me); DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
} }
void DamageTaken(Unit* who, uint32& damage) void DamageTaken(Unit* /*who*/, uint32& damage)
{ {
if (damage >= me->GetHealth()) if (damage >= me->GetHealth())
{ {
@@ -429,7 +435,7 @@ class boss_hodir : public CreatureScript
for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr) for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid())) if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
if (Aura* BitingColdAura = target->GetAura(SPELL_BITING_COLD_TRIGGERED)) if (Aura* BitingColdAura = target->GetAura(SPELL_BITING_COLD_TRIGGERED))
if (target->GetTypeId() == TYPEID_PLAYER && BitingColdAura->GetStackAmount() > 2) if ((target->GetTypeId() == TYPEID_PLAYER) && (BitingColdAura->GetStackAmount() > 2))
me->AI()->SetData(DATA_GETTING_COLD_IN_HERE, 0); me->AI()->SetData(DATA_GETTING_COLD_IN_HERE, 0);
gettingColdInHereTimer = 1000; gettingColdInHereTimer = 1000;
} }
@@ -631,7 +637,7 @@ class npc_hodir_priest : public CreatureScript
DoSpellAttackIfReady(SPELL_SMITE); DoSpellAttackIfReady(SPELL_SMITE);
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -693,7 +699,7 @@ class npc_hodir_shaman : public CreatureScript
DoSpellAttackIfReady(SPELL_LAVA_BURST); DoSpellAttackIfReady(SPELL_LAVA_BURST);
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -754,7 +760,7 @@ class npc_hodir_druid : public CreatureScript
DoSpellAttackIfReady(SPELL_WRATH); DoSpellAttackIfReady(SPELL_WRATH);
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -819,7 +825,7 @@ class npc_hodir_mage : public CreatureScript
DoSpellAttackIfReady(SPELL_FIREBALL); DoSpellAttackIfReady(SPELL_FIREBALL);
} }
void JustDied(Unit* who) void JustDied(Unit* /*who*/)
{ {
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0)) if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS); Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -855,7 +861,7 @@ class npc_toasty_fire : public CreatureScript
DoCast(me, SPELL_SINGED, true); DoCast(me, SPELL_SINGED, true);
} }
void SpellHit(Unit* who, const SpellEntry* spell) void SpellHit(Unit* /*who*/, const SpellEntry* spell)
{ {
if (spell->Id == SPELL_BLOCK_OF_ICE || spell->Id == SPELL_ICE_SHARD || spell->Id == SPELL_ICE_SHARD_HIT) if (spell->Id == SPELL_BLOCK_OF_ICE || spell->Id == SPELL_ICE_SHARD || spell->Id == SPELL_ICE_SHARD_HIT)
{ {
@@ -881,7 +887,7 @@ class spell_biting_cold : public SpellScriptLoader
{ {
PrepareAuraScript(spell_biting_cold_AuraScript); PrepareAuraScript(spell_biting_cold_AuraScript);
void HandleEffectPeriodic(AuraEffect const* aurEff) void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{ {
Unit* caster = GetCaster(); Unit* caster = GetCaster();
Unit* target = GetTarget(); Unit* target = GetTarget();
@@ -940,7 +946,7 @@ public:
{ {
PrepareAuraScript(spell_biting_cold_dot_AuraScript); PrepareAuraScript(spell_biting_cold_dot_AuraScript);
void HandleEffectPeriodic(AuraEffect const* aurEff) void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{ {
Unit* caster = GetCaster(); Unit* caster = GetCaster();
if (!caster) if (!caster)