diff options
| author | Carbenium <keresztesschmidt@gmail.com> | 2015-04-05 00:41:21 +0200 |
|---|---|---|
| committer | Carbenium <keresztesschmidt@gmail.com> | 2015-04-05 00:41:21 +0200 |
| commit | aa1971964bf8ed70f0ca114fdc2d42ad774e9bbd (patch) | |
| tree | e04a8ce2b8d27d05ab6b177b8d5524d657616e24 /src/server/scripts/OutdoorPvP | |
| parent | 67238e21666b580c3dcec611c1ff59606bd9e992 (diff) | |
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
Diffstat (limited to 'src/server/scripts/OutdoorPvP')
| -rw-r--r-- | src/server/scripts/OutdoorPvP/OutdoorPvPZM.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h index a08e141294d..9c76b35937e 100644 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h @@ -184,9 +184,9 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint public: OPvPCapturePointZM_GraveYard(OutdoorPvP* pvp); - bool Update(uint32 diff); + bool Update(uint32 diff) override; - void ChangeState() { } + void ChangeState() override { } void FillInitialWorldStates(WorldPacket & data); @@ -196,11 +196,11 @@ class OPvPCapturePointZM_GraveYard : public OPvPCapturePoint void SetBeaconState(uint32 controlling_team); // not good atm - bool HandleGossipOption(Player* player, ObjectGuid guid, uint32 gossipid); + bool HandleGossipOption(Player* player, ObjectGuid guid, uint32 gossipid) override; - bool HandleDropFlag(Player* player, uint32 spellId); + bool HandleDropFlag(Player* player, uint32 spellId) override; - bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso); + bool CanTalkTo(Player* player, Creature* creature, GossipMenuItems const& gso) override; uint32 GetGraveYardState() const; |
