diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-04-29 19:39:40 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-04-29 19:39:40 +0200 |
| commit | f9a6aa5479dc843f7bb8b58d027b5d6d483d3fd5 (patch) | |
| tree | f45262b22a888300024b62c2fa4154eceed2e2bd /src/server/scripts/Events | |
| parent | 1896b5cb5996e0f6e31c3693035257ac6d410392 (diff) | |
| parent | 24ae6a6802da5fc3f90b075d21cd4275e7138441 (diff) | |
Merge pull request #11950 from Dehravor/override-final-delete
Core/Misc: Remove obsolete C++11 backward compatibility macros
Diffstat (limited to 'src/server/scripts/Events')
| -rw-r--r-- | src/server/scripts/Events/childrens_week.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index 9a332fe335d..eeda208f0e1 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -160,7 +160,7 @@ class npc_winterfin_playmate : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -259,7 +259,7 @@ class npc_snowfall_glade_playmate : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -360,7 +360,7 @@ class npc_the_biggest_tree : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -447,7 +447,7 @@ class npc_high_oracle_soo_roo : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -536,7 +536,7 @@ class npc_elder_kekek : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -625,7 +625,7 @@ class npc_the_etymidian : public CreatureScript orphanGUID = 0; } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -721,7 +721,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript orphanGUID = 0; } - void SetData(uint32 type, uint32 data) OVERRIDE + void SetData(uint32 type, uint32 data) override { // Existing SmartAI if (type == 0) @@ -738,7 +738,7 @@ class npc_alexstraza_the_lifebinder : public CreatureScript } } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (!phase && who && who->GetDistance2d(me) < 10.0f) @@ -933,7 +933,7 @@ class npc_cw_area_trigger : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who && me->GetDistance2d(who) < 20.0f) @@ -1030,7 +1030,7 @@ class npc_grizzlemaw_cw_trigger : public CreatureScript me->SetDisplayId(DISPLAY_INVISIBLE); } - void MoveInLineOfSight(Unit* who) OVERRIDE + void MoveInLineOfSight(Unit* who) override { if (who && who->GetDistance2d(me) < 10.0f) |