From aa1971964bf8ed70f0ca114fdc2d42ad774e9bbd Mon Sep 17 00:00:00 2001 From: Carbenium Date: Sun, 5 Apr 2015 00:41:21 +0200 Subject: Add missing override keyword in scripts (cherry picked from commit b948a4275e90c59db2599a1961937d62f17736ce) Conflicts: src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp src/server/scripts/Kalimdor/zone_tanaris.cpp src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp src/server/scripts/OutdoorPvP/OutdoorPvPZM.h src/server/scripts/Spells/spell_mage.cpp src/server/scripts/Spells/spell_paladin.cpp --- .../Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/server/scripts/Outland/HellfireCitadel') diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp index 0d7fe11956b..7d00cd97126 100644 --- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_warbringer_omrogg.cpp @@ -416,7 +416,7 @@ class npc_omrogg_heads : public CreatureScript void EnterCombat(Unit* /*who*/) override { } - void SetData(uint32 data, uint32 value) + void SetData(uint32 data, uint32 value) override { if (data == SETDATA_DATA && value == SETDATA_YELL) { -- cgit v1.2.3