Fix compile without pch

This commit is contained in:
Spp
2012-10-16 09:35:15 +02:00
parent 7cc1b999a6
commit 14dab1f893
27 changed files with 39 additions and 33 deletions

View File

@@ -67,7 +67,7 @@ public:
return false;
}
if (AchievementEntry const* achievementEntry = sAchievementStore.LookupEntry(achievementId))
if (AchievementEntry const* achievementEntry = sAchievementMgr->GetAchievement(achievementId))
target->CompletedAchievement(achievementEntry);
return true;

View File

@@ -1345,7 +1345,7 @@ public:
return true;
}
static bool HandleDebugPhaseCommand(ChatHandler* handler, char const* args)
static bool HandleDebugPhaseCommand(ChatHandler* handler, char const* /*args*/)
{
Unit* unit = handler->getSelectedUnit();
Player* player = handler->GetSession()->GetPlayer();

View File

@@ -137,7 +137,7 @@ public:
}
case DISABLE_TYPE_ACHIEVEMENT_CRITERIA:
{
if (!sAchievementCriteriaStore.LookupEntry(entry))
if (!sAchievementMgr->GetAchievementCriteria(entry))
{
handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND);
handler->SetSentErrorMessage(true);

View File

@@ -941,7 +941,7 @@ public:
{
wpCreature->SetDisplayId(target->GetDisplayId());
wpCreature->SetObjectScale(0.5f);
wpCreature->SetLevel(point > STRONG_MAX_LEVEL ? STRONG_MAX_LEVEL : point);
wpCreature->SetLevel(std::min<uint32>(point, STRONG_MAX_LEVEL));
}
}
while (result->NextRow());

View File

@@ -317,7 +317,7 @@ public:
eventTimer = 3000;
if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX)))
{
AchievementEntry const* AchievWC = sAchievementStore.LookupEntry(ACHIEVEMENT_WAILING_CAVERNS);
AchievementEntry const* AchievWC = sAchievementMgr->GetAchievement(ACHIEVEMENT_WAILING_CAVERNS);
if (AchievWC)
{
Map* map = me->GetMap();

View File

@@ -695,7 +695,7 @@ class npc_halion_controller : public CreatureScript
halion->AI()->Talk(SAY_INTRO);
break;
case EVENT_TWILIGHT_MENDING:
if (Creature* halion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION)))
if (ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_HALION)))
if (Creature* twilightHalion = ObjectAccessor::GetCreature(*me, _instance->GetData64(DATA_TWILIGHT_HALION)))
twilightHalion->CastSpell((Unit*)NULL, SPELL_TWILIGHT_MENDING, true);
break;
@@ -1114,7 +1114,7 @@ class npc_combustion_consumption : public CreatureScript
struct npc_combustion_consumptionAI : public Scripted_NoMovementAI
{
npc_combustion_consumptionAI(Creature* creature) : Scripted_NoMovementAI(creature),
_summonerGuid(0), _instance(creature->GetInstanceScript())
_instance(creature->GetInstanceScript()), _summonerGuid(0)
{
switch (me->GetEntry())
{

View File

@@ -154,7 +154,7 @@ public:
CheckPlayersFrostResist();
if (CanTheHundredClub)
{
AchievementEntry const* AchievTheHundredClub = sAchievementStore.LookupEntry(ACHIEVEMENT_THE_HUNDRED_CLUB);
AchievementEntry const* AchievTheHundredClub = sAchievementMgr->GetAchievement(ACHIEVEMENT_THE_HUNDRED_CLUB);
if (AchievTheHundredClub)
{
if (map && map->IsDungeon())

View File

@@ -232,7 +232,7 @@ public:
{
npc_verdisa_beglaristrasz_eternosAI(Creature* creature) : ScriptedAI(creature) { }
void MovementInform(uint32 type, uint32 id)
void MovementInform(uint32 /*type*/, uint32 id)
{
// When Belgaristraz finish his moving say grateful text
if (me->GetEntry() == NPC_BELGARISTRASZ)

View File

@@ -153,7 +153,7 @@ public:
if (IsHeroic() && GolemsShattered < 5)
{
AchievementEntry const* AchievShatterResistant = sAchievementStore.LookupEntry(ACHIEVEMENT_SHATTER_RESISTANT);
AchievementEntry const* AchievShatterResistant = sAchievementMgr->GetAchievement(ACHIEVEMENT_SHATTER_RESISTANT);
if (AchievShatterResistant)
{
Map* map = me->GetMap();

View File

@@ -2115,7 +2115,7 @@ class npc_shadowfiend : public CreatureScript
{
npc_shadowfiendAI(Creature* creature) : PetAI(creature) {}
void JustDied(Unit* killer)
void JustDied(Unit* /*killer*/)
{
if (me->isSummon())
if (Unit* owner = me->ToTempSummon()->GetSummoner())