Misc: Use override and final C++11 keywords in a few places (mostly scripts)

OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
This commit is contained in:
Nay committed 2013-07-06 20:21:45 +01:00
1 parent 0c911af24c
commit 3561ab98ba
577 files changed
+8945 -8757

No files matched your search

+11 -11
View File
@@ -56,13 +56,13 @@ public:
{
guard_genericAI(Creature* creature) : GuardAI(creature) {}
void Reset()
void Reset() OVERRIDE
{
globalCooldown = 0;
buffTimer = 0;
}
void EnterCombat(Unit* who)
void EnterCombat(Unit* who) OVERRIDE
{
if (me->GetEntry() == NPC_CENARION_HOLD_INFANTRY)
Talk(SAY_GUARD_SIL_AGGRO, who->GetGUID());
@@ -70,7 +70,7 @@ public:
DoCast(who, spell->Id);
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) OVERRIDE
{
//Always decrease our global cooldown first
if (globalCooldown > diff)
@@ -219,7 +219,7 @@ public:
}
}
void ReceiveEmote(Player* player, uint32 textEmote)
void ReceiveEmote(Player* player, uint32 textEmote) OVERRIDE
{
switch (me->GetEntry())
{
@@ -242,7 +242,7 @@ public:
uint32 buffTimer;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new guard_genericAI(creature);
}
@@ -265,7 +265,7 @@ public:
{
guard_shattrath_scryerAI(Creature* creature) : GuardAI(creature) {}
void Reset()
void Reset() OVERRIDE
{
banishTimer = 5000;
exileTimer = 8500;
@@ -273,7 +273,7 @@ public:
canTeleport = false;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) OVERRIDE
{
if (!UpdateVictim())
return;
@@ -315,7 +315,7 @@ public:
bool canTeleport;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new guard_shattrath_scryerAI(creature);
}
@@ -330,7 +330,7 @@ public:
{
guard_shattrath_aldorAI(Creature* creature) : GuardAI(creature) {}
void Reset()
void Reset() OVERRIDE
{
banishTimer = 5000;
exileTimer = 8500;
@@ -338,7 +338,7 @@ public:
canTeleport = false;
}
void UpdateAI(uint32 diff)
void UpdateAI(uint32 diff) OVERRIDE
{
if (!UpdateVictim())
return;
@@ -379,7 +379,7 @@ public:
bool canTeleport;
};
CreatureAI* GetAI(Creature* creature) const
CreatureAI* GetAI(Creature* creature) const OVERRIDE
{
return new guard_shattrath_aldorAI(creature);
}