Core: Fix some warnings

This commit is contained in:
Spp committed 2011-01-11 11:18:00 +01:00
1 parent a039086bca
commit bd2728eb74
27 files changed
+62 -61

No files matched your search

@@ -78,7 +78,7 @@ public:
return true;
}
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 uiAction)
bool OnGossipSelect(Player* pPlayer, Creature* pCreature, uint32 /*uiSender*/, uint32 /*uiAction*/)
{
//ScriptedInstance* pInstance = pCreature->GetInstanceData();
@@ -137,7 +137,7 @@ public:
return;
if (((!me->FindNearestCreature(ENTRY_FLAMEWALKER_HEALER,100.0f)) && (!me->FindNearestCreature(ENTRY_FLAMEWALKER_ELITE,100.0f))) && (!m_pInstance->GetData(DATA_MAJORDOMOISDEAD)))
{
{
me->setFaction(35);
me->AI()->EnterEvadeMode();
DoScriptText(SAY_DEFEAT, me);
@@ -413,7 +413,7 @@ public:
pInstance->SetData(DATA_RAG_ELE_COUNTER, 1);
}
void UpdateAI(const uint32 diff)
void UpdateAI(const uint32 /*diff*/)
{
if (!UpdateVictim())
return;
@@ -284,14 +284,14 @@ class spell_ex_absorb_aura : public SpellScriptLoader
SPELL_TRIGGERED = 18282
};
void HandleOnEffectAbsorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void HandleOnEffectAbsorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
sLog->outString("Our aura is now absorbing damage done to us!");
// absorb whole damage done to us
absorbAmount = dmgInfo.GetDamage();
}
void HandleAfterEffectAbsorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void HandleAfterEffectAbsorb(AuraEffect * /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
sLog->outString("Our aura has absorbed %u damage!", absorbAmount);
}
@@ -174,7 +174,7 @@ class boss_garfrost : public CreatureScript
SetEquipmentSlots(false, EQUIP_ID_MACE);
}
uint32 GetData(uint32 type)
uint32 GetData(uint32 /*type*/)
{
return _permafrostStack;
}
@@ -293,7 +293,7 @@ class boss_krick : public CreatureScript
struct boss_krickAI : public ScriptedAI
{
boss_krickAI(Creature* creature) : ScriptedAI(creature), _summons(creature), _instanceScript(creature->GetInstanceScript())
boss_krickAI(Creature* creature) : ScriptedAI(creature), _instanceScript(creature->GetInstanceScript()), _summons(creature)
{
}
@@ -388,7 +388,7 @@ class player_overlord_brandAI : public PlayerAI
me->CastCustomSpell(SPELL_OVERLORD_BRAND_HEAL, SPELLVALUE_BASE_POINT0, int32(addHealth*5.5f), tyrannus, true, NULL, NULL, tyrannus->GetGUID());
}
void UpdateAI(const uint32 diff) { }
void UpdateAI(const uint32 /*diff*/) { }
private:
Creature* tyrannus;
@@ -115,7 +115,7 @@ public:
uiVaporCount = 0;
}
void EnterCombat(Unit * pWho)
void EnterCombat(Unit * /*pWho*/)
{
_EnterCombat();
@@ -204,12 +204,12 @@ public:
bShadowDodger = false;
}
void KilledUnit(Unit * pWho)
void KilledUnit(Unit * /*pWho*/)
{
DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2), me);
}
void JustDied(Unit * pWho)
void JustDied(Unit * /*pWho*/)
{
_JustDied();
@@ -327,7 +327,7 @@ public:
uiProfoundOfDarknessTimer = 3000;
}
void JustDied(Unit * pWho)
void JustDied(Unit * /*pWho*/)
{
if (Creature * pVezax = me->GetCreature(*me, pInstance ? pInstance->GetData64(TYPE_VEZAX) : 0))
pVezax->AI()->DoAction(ACTION_ANIMUS_DIE);
@@ -388,7 +388,7 @@ public:
uiRandomMoveTimer -= uiDiff;
}
void DamageTaken(Unit * pWho, uint32 &uiDamage)
void DamageTaken(Unit * /*pWho*/, uint32 &uiDamage)
{
// This can't be on JustDied. In 63322 dummy handler caster needs to be this NPC
// if caster == target then damage mods will increase the damage taken
@@ -414,4 +414,4 @@ void AddSC_boss_general_vezax()
new boss_general_vezax();
new boss_saronite_animus();
new npc_saronite_vapors();
}
}
@@ -127,7 +127,7 @@ public:
DoScriptText(RAND(SAY_SLAY_2,SAY_SLAY_2), me);
}
void PassengerBoarded(Unit *who, int8 seatId, bool apply)
void PassengerBoarded(Unit *who, int8 /*seatId*/, bool apply)
{
if (who->GetTypeId() == TYPEID_UNIT)
{
@@ -225,7 +225,7 @@ public:
uint32 uiPermittedDamage;
InstanceScript * pInstance;
void EnterCombat(Unit* who)
void EnterCombat(Unit* /*who*/)
{
EncounterInCombat(me, pInstance);
uiStoneGripTimer = 30000;
@@ -239,7 +239,7 @@ public:
DoCast(SPELL_ARM_VISUAL);
}
void DamageTaken(Unit* who, uint32& damage)
void DamageTaken(Unit* /*who*/, uint32& damage)
{
if (uiGrippedTargets[0] == 0)
return;
@@ -331,7 +331,7 @@ public:
uint32 uiSweepTimer;
InstanceScript * pInstance;
void EnterCombat(Unit* who)
void EnterCombat(Unit* /*who*/)
{
EncounterInCombat(me, pInstance);
uiSweepTimer = 15000;
@@ -30,7 +30,7 @@ class npc_four_car_garage : public CreatureScript
{
npc_four_car_garageAI(Creature* pCreature) : NullCreatureAI(pCreature) { }
void PassengerBoarded(Unit* who, int8 seatId, bool apply)
void PassengerBoarded(Unit* who, int8 /*seatId*/, bool apply)
{
if (apply)
{
@@ -70,4 +70,4 @@ class npc_four_car_garage : public CreatureScript
void AddSC_isle_of_conquest()
{
new npc_four_car_garage();
}
}
+7 -7
View File
@@ -50,7 +50,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// TODO: this should absorb limited amount of damage, but no info on calculation formula
amount = -1;
@@ -102,18 +102,18 @@ public:
return sSpellStore.LookupEntry(DK_SPELL_RUNIC_POWER_ENERGIZE);
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
absorbAmount = std::min(CalculatePctN(dmgInfo.GetDamage(), absorbPct), GetTarget()->CountPctFromMaxHealth(hpPct));
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
Unit * target = GetTarget();
// damage absorbed by Anti-Magic Shell energizes the DK with additional runic power.
@@ -164,7 +164,7 @@ public:
return sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT);
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
SpellEntry const * talentSpell = sSpellStore.LookupEntry(DK_SPELL_ANTI_MAGIC_SHELL_TALENT);
amount = SpellMgr::CalculateSpellEffectAmount(talentSpell, EFFECT_0, GetCaster());
@@ -334,7 +334,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -396,7 +396,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
+4 -4
View File
@@ -101,7 +101,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -145,7 +145,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -189,13 +189,13 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
absorbAmount = uint32(CalculatePctN(GetTarget()->GetTotalAttackPowerValue(BASE_ATTACK), absorbPct));
aurEff->SetAmount(0);
+1 -1
View File
@@ -43,7 +43,7 @@ public:
return true;
}
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
absorbAmount = std::min(limit, absorbAmount);
}
+2 -2
View File
@@ -281,7 +281,7 @@ public:
&& sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
Unit * target = GetTarget();
@@ -326,7 +326,7 @@ public:
&& sSpellStore.LookupEntry(SPELL_MAGE_INCANTERS_ABSORBTION_R1);
}
void Trigger(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Trigger(AuraEffect * aurEff, DamageInfo & /*dmgInfo*/, uint32 & absorbAmount)
{
Unit * target = GetTarget();
+1 -1
View File
@@ -63,7 +63,7 @@ public:
return GetUnitOwner()->ToPlayer();
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
+2 -2
View File
@@ -59,13 +59,13 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
Unit * target = GetTarget();
if (dmgInfo.GetDamage() < target->GetHealth())
+3 -3
View File
@@ -58,13 +58,13 @@ public:
return GetUnitOwner()->ToPlayer();
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
}
void Absorb(AuraEffect * aurEff, DamageInfo & dmgInfo, uint32 & absorbAmount)
void Absorb(AuraEffect * /*aurEff*/, DamageInfo & dmgInfo, uint32 & absorbAmount)
{
Unit * target = GetTarget();
if (dmgInfo.GetDamage() < target->GetHealth())
@@ -118,7 +118,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
+1 -1
View File
@@ -54,7 +54,7 @@ public:
return true;
}
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & canBeRecalculated)
void CalculateAmount(AuraEffect const * /*aurEff*/, int32 & amount, bool & /*canBeRecalculated*/)
{
// Set absorbtion amount to unlimited
amount = -1;
@@ -136,7 +136,7 @@ class achievement_bg_ic_glaive_grave : public AchievementCriteriaScript
public:
achievement_bg_ic_glaive_grave() : AchievementCriteriaScript("achievement_bg_ic_glaive_grave") { }
bool OnCheck(Player* source, Unit* target)
bool OnCheck(Player* source, Unit* /*target*/)
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
{
@@ -153,7 +153,7 @@ class achievement_bg_ic_mowed_down : public AchievementCriteriaScript
public:
achievement_bg_ic_mowed_down() : AchievementCriteriaScript("achievement_bg_ic_mowed_down") { }
bool OnCheck(Player* source, Unit* target)
bool OnCheck(Player* source, Unit* /*target*/)
{
if (Creature* vehicle = source->GetVehicleCreatureBase())
{