Core/Misc: Remove obsolete C++11 backward compatibility macros

OVERRIDE, FINAL, DELETE_MEMBER
This commit is contained in:
Dehravor committed 2014-04-29 16:35:11 +02:00
1 parent 414554aefa
commit 24ae6a6802
639 files changed
+9594 -9604

No files matched your search

@@ -44,7 +44,7 @@ class npc_crusade_persuaded : public CreatureScript
public:
npc_crusade_persuaded() : CreatureScript("npc_crusade_persuaded") { }
CreatureAI* GetAI(Creature* creature) const OVERRIDE
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_crusade_persuadedAI(creature);
}
@@ -57,7 +57,7 @@ public:
uint32 speechCounter;
uint64 playerGUID;
void Reset() OVERRIDE
void Reset() override
{
speechTimer = 0;
speechCounter = 0;
@@ -66,7 +66,7 @@ public:
me->RestoreFaction();
}
void SpellHit(Unit* caster, const SpellInfo* spell) OVERRIDE
void SpellHit(Unit* caster, const SpellInfo* spell) override
{
if (spell->Id == SPELL_PERSUASIVE_STRIKE && caster->GetTypeId() == TYPEID_PLAYER && me->IsAlive() && !speechCounter)
{
@@ -90,7 +90,7 @@ public:
}
}
void UpdateAI(uint32 diff) OVERRIDE
void UpdateAI(uint32 diff) override
{
if (speechCounter)
{
@@ -191,7 +191,7 @@ class npc_koltira_deathweaver : public CreatureScript
public:
npc_koltira_deathweaver() : CreatureScript("npc_koltira_deathweaver") { }
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) OVERRIDE
bool OnQuestAccept(Player* player, Creature* creature, const Quest* quest) override
{
if (quest->GetQuestId() == QUEST_BREAKOUT)
{
@@ -210,7 +210,7 @@ public:
me->SetReactState(REACT_DEFENSIVE);
}
void Reset() OVERRIDE
void Reset() override
{
if (!HasEscortState(STATE_ESCORT_ESCORTING))
{
@@ -224,7 +224,7 @@ public:
}
}
void WaypointReached(uint32 waypointId) OVERRIDE
void WaypointReached(uint32 waypointId) override
{
switch (waypointId)
{
@@ -258,7 +258,7 @@ public:
}
}
void JustSummoned(Creature* summoned) OVERRIDE
void JustSummoned(Creature* summoned) override
{
if (Player* player = GetPlayerForEscort())
summoned->AI()->AttackStart(player);
@@ -275,7 +275,7 @@ public:
me->SummonCreature(NPC_CRIMSON_ACOLYTE, 1642.329f, -6045.818f, 127.583f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
}
void UpdateAI(uint32 uiDiff) OVERRIDE
void UpdateAI(uint32 uiDiff) override
{
npc_escortAI::UpdateAI(uiDiff);
@@ -347,7 +347,7 @@ public:
};
CreatureAI* GetAI(Creature* creature) const OVERRIDE
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_koltira_deathweaverAI(creature);
}
@@ -368,7 +368,7 @@ class npc_scarlet_courier : public CreatureScript
public:
npc_scarlet_courier() : CreatureScript("npc_scarlet_courier") { }
CreatureAI* GetAI(Creature* creature) const OVERRIDE
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_scarlet_courierAI(creature);
}
@@ -380,21 +380,21 @@ public:
uint32 uiStage;
uint32 uiStage_timer;
void Reset() OVERRIDE
void Reset() override
{
me->Mount(14338); // not sure about this id
uiStage = 1;
uiStage_timer = 3000;
}
void EnterCombat(Unit* /*who*/) OVERRIDE
void EnterCombat(Unit* /*who*/) override
{
Talk(SAY_TREE2);
me->Dismount();
uiStage = 0;
}
void MovementInform(uint32 type, uint32 id) OVERRIDE
void MovementInform(uint32 type, uint32 id) override
{
if (type != POINT_MOTION_TYPE)
return;
@@ -403,7 +403,7 @@ public:
uiStage = 2;
}
void UpdateAI(uint32 diff) OVERRIDE
void UpdateAI(uint32 diff) override
{
if (uiStage && !me->IsInCombat())
{
@@ -460,7 +460,7 @@ class npc_high_inquisitor_valroth : public CreatureScript
public:
npc_high_inquisitor_valroth() : CreatureScript("npc_high_inquisitor_valroth") { }
CreatureAI* GetAI(Creature* creature) const OVERRIDE
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_high_inquisitor_valrothAI(creature);
}
@@ -473,20 +473,20 @@ public:
uint32 uiInquisitor_Penance_timer;
uint32 uiValroth_Smite_timer;
void Reset() OVERRIDE
void Reset() override
{
uiRenew_timer = 1000;
uiInquisitor_Penance_timer = 2000;
uiValroth_Smite_timer = 1000;
}
void EnterCombat(Unit* who) OVERRIDE
void EnterCombat(Unit* who) override
{
Talk(SAY_VALROTH_AGGRO);
DoCast(who, SPELL_VALROTH_SMITE);
}
void UpdateAI(uint32 diff) OVERRIDE
void UpdateAI(uint32 diff) override
{
if (uiRenew_timer <= diff)
{
@@ -518,7 +518,7 @@ public:
Talk(SAY_VALROTH_RAND);
}
void JustDied(Unit* killer) OVERRIDE
void JustDied(Unit* killer) override
{
Talk(SAY_VALROTH_DEATH);
killer->CastSpell(me, SPELL_SUMMON_VALROTH_REMAINS, true);
@@ -596,7 +596,7 @@ class npc_a_special_surprise : public CreatureScript
public:
npc_a_special_surprise() : CreatureScript("npc_a_special_surprise") { }
CreatureAI* GetAI(Creature* creature) const OVERRIDE
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_a_special_surpriseAI(creature);
}
@@ -609,7 +609,7 @@ public:
uint32 ExecuteSpeech_Counter;
uint64 PlayerGUID;
void Reset() OVERRIDE
void Reset() override
{
ExecuteSpeech_Timer = 0;
ExecuteSpeech_Counter = 0;
@@ -667,7 +667,7 @@ public:
return false;
}
void MoveInLineOfSight(Unit* who) OVERRIDE
void MoveInLineOfSight(Unit* who) override
{
if (PlayerGUID || who->GetTypeId() != TYPEID_PLAYER || !who->IsWithinDist(me, INTERACTION_DISTANCE))
@@ -677,7 +677,7 @@ public:
PlayerGUID = who->GetGUID();
}
void UpdateAI(uint32 diff) OVERRIDE
void UpdateAI(uint32 diff) override
{
if (PlayerGUID && !me->GetVictim() && me->IsAlive())
{