Core: Warning fixes

This commit is contained in:
Shauren
2011-05-07 19:08:50 +02:00
parent b82ae5ad0d
commit 7905200eba
16 changed files with 44 additions and 28 deletions
@@ -531,7 +531,7 @@ public:
};
#define ESSENCE_REMOVE 0
#define ESSENCE_REMOVE 0
#define ESSENCE_APPLY 1
class mob_essence_of_twin : public CreatureScript
@@ -545,14 +545,19 @@ class mob_essence_of_twin : public CreatureScript
uint32 GetData(uint32 data)
{
uint32 spellReturned;
uint32 spellReturned = 0;
switch (me->GetEntry())
{
case NPC_LIGHT_ESSENCE:
spellReturned = data == ESSENCE_REMOVE? SPELL_DARK_ESSENCE_HELPER : SPELL_LIGHT_ESSENCE_HELPER;
break;
case NPC_DARK_ESSENCE:
spellReturned = data == ESSENCE_REMOVE? SPELL_LIGHT_ESSENCE_HELPER : SPELL_DARK_ESSENCE_HELPER;
break;
default:
break;
}
return spellReturned;
}
};
@@ -1178,7 +1178,7 @@ class spell_deathbringer_blood_nova_targeting : public SpellScriptLoader
{
// select one random target, with preference of ranged targets
uint32 targetsAtRange = 0;
uint32 const minTargets = GetCaster()->GetMap()->GetSpawnMode() & 1 ? 10 : 4;
uint32 const minTargets = uint32(GetCaster()->GetMap()->GetSpawnMode() & 1 ? 10 : 4);
unitList.sort(Trinity::ObjectDistanceOrderPred(GetCaster(), false));
// get target count at range
@@ -386,7 +386,7 @@ class spell_festergut_gastric_bloat : public SpellScriptLoader
{
PrepareSpellScript(spell_festergut_gastric_bloat_SpellScript);
bool Validate(SpellEntry const* spell)
bool Validate(SpellEntry const* /*spell*/)
{
if (!sSpellStore.LookupEntry(SPELL_GASTRIC_EXPLOSION))
return false;
@@ -499,7 +499,7 @@ class boss_professor_putricide : public CreatureScript
return _phase;
case DATA_ABOMINATION:
summons.RemoveNotExisting();
return summons.HasEntry(NPC_MUTATED_ABOMINATION_10) || summons.HasEntry(NPC_MUTATED_ABOMINATION_25);
return uint32(summons.HasEntry(NPC_MUTATED_ABOMINATION_10) || summons.HasEntry(NPC_MUTATED_ABOMINATION_25));
default:
break;
}
@@ -30,7 +30,7 @@ public:
struct instance_eye_of_eternity_InstanceMapScript : public InstanceScript
{
instance_eye_of_eternity_InstanceMapScript(Map* map) : InstanceScript(map)
instance_eye_of_eternity_InstanceMapScript(Map* map) : InstanceScript(map)
{
SetBossNumber(MAX_ENCOUNTER);
@@ -67,7 +67,8 @@ public:
if (GameObject* platform = instance->GetGameObject(platformGUID))
platform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED);
} else if (state == DONE)
}
else if (state == DONE)
{
if (Creature* malygos = instance->GetCreature(malygosGUID))
malygos->SummonCreature(NPC_ALEXSTRASZA, 829.0679f, 1244.77f, 279.7453f, 2.32f);
@@ -79,7 +80,7 @@ public:
platform->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_DESTROYED);
if (GameObject* chest = instance->GetGameObject(chestGUID))
chest->SetRespawnTime(chest->GetRespawnDelay());
chest->SetRespawnTime(7*DAY);
}
}
return true;
@@ -150,6 +151,11 @@ public:
}
}
// eliminate compile warning
void ProcessEvent(Unit* /*unit*/, uint32 /*eventId*/)
{
}
void VortexHandling()
{
if (Creature* malygos = instance->GetCreature(malygosGUID))
@@ -309,7 +309,7 @@ class boss_flame_leviathan : public CreatureScript
}
// TODO: effect 0 and effect 1 may be on different target
void SpellHitTarget(Unit* target, SpellEntry* const spell)
void SpellHitTarget(Unit* target, SpellEntry const* spell)
{
if (spell->Id == SPELL_PURSUED)
AttackStart(target);
@@ -336,7 +336,7 @@ class boss_flame_leviathan : public CreatureScript
}
}
void SpellHit(Unit* /*caster*/, SpellEntry* const spell)
void SpellHit(Unit* /*caster*/, SpellEntry const* spell)
{
if (spell->Id == SPELL_START_THE_ENGINE)
vehicle->InstallAllAccessories(false);
@@ -671,7 +671,7 @@ class boss_flame_leviathan_defense_cannon : public CreatureScript
NapalmTimer -= diff;
}
bool CanAIAttack(Unit* const who) const
bool CanAIAttack(Unit const* who) const
{
if (who->GetTypeId() != TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() == NPC_SEAT)
return false;
@@ -700,7 +700,7 @@ class boss_flame_leviathan_defense_turret : public CreatureScript
damage = 0;
}
bool CanAIAttack(Unit* const who) const
bool CanAIAttack(Unit const* who) const
{
if (who->GetTypeId() != TYPEID_PLAYER || !who->GetVehicle() || who->GetVehicleBase()->GetEntry() != NPC_SEAT)
return false;