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/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ public:
{
switch(type)
{
case EVENT_WARD_KEEPER: WardKeeperDeath++; break;
case EVENT_WARD_KEEPER: WardKeeperDeath++; break;
}
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
+18 -14
View File
@@ -18,6 +18,10 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "Cell.h"
#include "CellImpl.h"
#include "GridNotifiers.h"
#include "GridNotifiersImpl.h"
#include "ulduar.h"
/*
@@ -78,7 +82,7 @@ enum FreyaSpells
SPELL_GROUND_TREMOR = 62325,
SPELL_PETRIFIED_BARK = 62337,
SPELL_PETRIFIED_BARK_DMG = 62379,
// Ironbranch
SPELL_IMPALE = 62310,
SPELL_ROOTS_IRONBRANCH = 62438,
@@ -238,7 +242,7 @@ class npc_iron_roots : public CreatureScript
me->SetInCombatWith(summoner);
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Unit* target = ObjectAccessor::GetPlayer(*me, summonerGUID))
{
@@ -280,7 +284,7 @@ class boss_freya : public CreatureScript
uint8 waveCount;
uint8 elderCount;
uint8 attunedToNature;
bool checkElementalAlive[2];
bool trioDefeated[2];
bool waveInProgress;
@@ -314,12 +318,12 @@ class boss_freya : public CreatureScript
random[n] = false;
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* /*who*/)
{
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)
{
@@ -530,7 +534,7 @@ class boss_freya : public CreatureScript
}
}
}
DoMeleeAttackIfReady();
}
@@ -1118,7 +1122,7 @@ class npc_ancient_water_spirit : public CreatureScript
DoMeleeAttackIfReady();
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0))
{
@@ -1185,7 +1189,7 @@ class npc_storm_lasher : public CreatureScript
DoMeleeAttackIfReady();
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0))
{
@@ -1219,7 +1223,7 @@ class npc_snaplasher : public CreatureScript
uint8 waveCount;
void UpdateAI(uint32 const diff)
void UpdateAI(uint32 const /*diff*/)
{
if (!UpdateVictim())
return;
@@ -1230,7 +1234,7 @@ class npc_snaplasher : public CreatureScript
DoMeleeAttackIfReady();
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Freya = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_FREYA) : 0))
{
@@ -1310,7 +1314,7 @@ class npc_ancient_conservator : public CreatureScript
natureFuryTimer -= diff;
DoMeleeAttackIfReady();
}
}
};
CreatureAI* GetAI(Creature* creature) const
@@ -1393,14 +1397,14 @@ class npc_eonars_gift : public CreatureScript
struct npc_eonars_giftAI : public Scripted_NoMovementAI
{
npc_eonars_giftAI(Creature* creature) : Scripted_NoMovementAI(creature)
npc_eonars_giftAI(Creature* creature) : Scripted_NoMovementAI(creature)
{
lifeBindersGiftTimer = 12000;
DoCast(me, SPELL_GROW);
DoCast(me, SPELL_PHEROMONES, true);
DoCast(me, SPELL_EONAR_VISUAL, true);
}
uint32 lifeBindersGiftTimer;
void UpdateAI(uint32 const diff)
@@ -1650,4 +1654,4 @@ void AddSC_boss_freya()
new spell_attuned_to_nature_dose_reduction();
new spell_freya_iron_roots();
new spell_freya_attuned_to_nature();
}
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_hodir.cpp
+23 -17
View File
@@ -17,6 +17,12 @@
#include "ScriptMgr.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"
/* #TODO: Achievements
@@ -77,7 +83,7 @@ enum HodirSpells
SPELL_CONJURE_FIRE = 62823,
SPELL_MELT_ICE = 64528,
SPELL_SINGED = 62821,
// Priests
SPELL_SMITE = 61923,
SPELL_GREATER_HEAL = 62809,
@@ -116,7 +122,7 @@ enum HodirEvents
// Shaman
EVENT_STORM_CLOUD = 10,
// Druid
EVENT_STARLIGHT = 11,
@@ -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))
{
@@ -284,7 +290,7 @@ class boss_hodir : public CreatureScript
{
public:
boss_hodir() : CreatureScript("boss_hodir") { }
struct boss_hodirAI : public BossAI
{
boss_hodirAI(Creature* creature) : BossAI(creature, BOSS_HODIR)
@@ -309,7 +315,7 @@ class boss_hodir : public CreatureScript
FrozenHelper->CastSpell(FrozenHelper, SPELL_SUMMON_FLASH_FREEZE_HELPER, true);
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* /*who*/)
{
_EnterCombat();
DoScriptText(SAY_AGGRO, me);
@@ -329,13 +335,13 @@ class boss_hodir : public CreatureScript
events.ScheduleEvent(EVENT_BERSERK, 480000);
}
void KilledUnit(Unit* who)
void KilledUnit(Unit* /*who*/)
{
if (!urand(0, 3))
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())
{
@@ -429,7 +435,7 @@ class boss_hodir : public CreatureScript
for (std::list<HostileReference*>::const_iterator itr = ThreatList.begin(); itr != ThreatList.end(); ++itr)
if (Unit* target = ObjectAccessor::GetUnit(*me, (*itr)->getUnitGuid()))
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);
gettingColdInHereTimer = 1000;
}
@@ -631,7 +637,7 @@ class npc_hodir_priest : public CreatureScript
DoSpellAttackIfReady(SPELL_SMITE);
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -693,12 +699,12 @@ class npc_hodir_shaman : public CreatureScript
DoSpellAttackIfReady(SPELL_LAVA_BURST);
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
}
private:
InstanceScript* instance;
EventMap events;
@@ -754,7 +760,7 @@ class npc_hodir_druid : public CreatureScript
DoSpellAttackIfReady(SPELL_WRATH);
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -819,7 +825,7 @@ class npc_hodir_mage : public CreatureScript
DoSpellAttackIfReady(SPELL_FIREBALL);
}
void JustDied(Unit* who)
void JustDied(Unit* /*who*/)
{
if (Creature* Hodir = ObjectAccessor::GetCreature(*me, instance ? instance->GetData64(BOSS_HODIR) : 0))
Hodir->AI()->DoAction(ACTION_I_HAVE_THE_COOLEST_FRIENDS);
@@ -855,7 +861,7 @@ class npc_toasty_fire : public CreatureScript
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)
{
@@ -881,7 +887,7 @@ class spell_biting_cold : public SpellScriptLoader
{
PrepareAuraScript(spell_biting_cold_AuraScript);
void HandleEffectPeriodic(AuraEffect const* aurEff)
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{
Unit* caster = GetCaster();
Unit* target = GetTarget();
@@ -940,7 +946,7 @@ public:
{
PrepareAuraScript(spell_biting_cold_dot_AuraScript);
void HandleEffectPeriodic(AuraEffect const* aurEff)
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
{
Unit* caster = GetCaster();
if (!caster)
@@ -979,4 +985,4 @@ void AddSC_boss_hodir()
new npc_flash_freeze();
new spell_biting_cold();
new spell_biting_cold_dot();
}
}
src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+1 -1
View File
@@ -836,7 +836,7 @@ class npc_darkrune_watcher : public CreatureScript
struct npc_darkrune_watcherAI : public ScriptedAI
{
npc_darkrune_watcherAI(Creature* creature) : ScriptedAI(creature){}
npc_darkrune_watcherAI(Creature* creature) : ScriptedAI(creature){}
uint32 ChainTimer;
uint32 LightTimer;
src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+1 -1
View File
@@ -503,7 +503,7 @@ public:
return RazorHarpoonGUIDs[2];
case GO_RAZOR_HARPOON_4:
return RazorHarpoonGUIDs[3];
// Assembly of Iron
case BOSS_STEELBREAKER:
return AssemblyGUIDs[0];
src/server/scripts/Northrend/Ulduar/ulduar/ulduar_teleporter.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ class ulduar_teleporter : public GameObjectScript
if (instance->GetBossState(BOSS_AURIAYA) == DONE)
player->ADD_GOSSIP_ITEM(GOSSIP_ICON_CHAT, "Teleport to the Conservatory of Life", GOSSIP_SENDER_MAIN, CONSERVATORY);
}
player->SEND_GOSSIP_MENU(gameObject->GetGOInfo()->GetGossipMenuId(), gameObject->GetGUID());
return true;
}
src/server/scripts/Outland/boss_doomlord_kazzak.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ class boss_doomlord_kazzak : public CreatureScript
struct boss_doomlordkazzakAI : public ScriptedAI
{
boss_doomlordkazzakAI(Creature* creature) : ScriptedAI(creature)
boss_doomlordkazzakAI(Creature* creature) : ScriptedAI(creature)
{
}
@@ -159,7 +159,7 @@ class boss_doomlord_kazzak : public CreatureScript
private:
EventMap _events;
};
CreatureAI* GetAI(Creature* creature) const
{
return new boss_doomlordkazzakAI (creature);
src/server/scripts/Outland/boss_doomwalker.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ class boss_doomwalker : public CreatureScript
struct boss_doomwalkerAI : public ScriptedAI
{
boss_doomwalkerAI(Creature* creature) : ScriptedAI(creature)
boss_doomwalkerAI(Creature* creature) : ScriptedAI(creature)
{
}
src/server/scripts/Spells/spell_mage.cpp
+1 -1
View File
@@ -261,7 +261,7 @@ public:
class spell_mage_incanters_absorbtion_base_AuraScript : public AuraScript
{
public:
public:
enum Spells
{
SPELL_MAGE_INCANTERS_ABSORBTION_TRIGGERED = 44413,