Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 08:28:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Scripts: add missing override and silence a warning in MSVC

Browse Source
This commit is contained in:
ariel-
2016-07-23 04:21:08 -03:00
parent 1eeff3a295
commit ea8bb37bc7
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
View File

@@ -219,7 +219,10 @@ public:
uint32 GetData(uint32 type) const override
{
return type == DATA_I_HATE_THAT_SONG ? _achievement : 0;
if (type == DATA_I_HATE_THAT_SONG)
return _achievement ? 1 : 0;
return 0;
}
void UpdateAI(uint32 diff) override
@@ -427,16 +430,12 @@ class achievement_hate_that_song : public AchievementCriteriaScript
public:
achievement_hate_that_song() : AchievementCriteriaScript("achievement_hate_that_song") { }
bool OnCheck(Player* /*source*/, Unit* target)
bool OnCheck(Player* /*source*/, Unit* target) override
{
if (!target)
if (!target || !target->IsAIEnabled)
return false;
if (target->GetMap()->IsHeroic())
if (target->ToCreature())
return target->ToCreature()->AI()->GetData(DATA_I_HATE_THAT_SONG);
return false;
return target->GetMap()->IsHeroic() && target->GetAI()->GetData(DATA_I_HATE_THAT_SONG);
}
};