aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/OutdoorPvP
diff options
context:
space:
mode:
authorCarbenium <keresztesschmidt@gmail.com>2015-04-05 00:16:36 +0200
committerCarbenium <keresztesschmidt@gmail.com>2015-04-05 00:16:36 +0200
commit6252330a772b49046be84ad7d16c8c3ce94de841 (patch)
treea74839bee1cac6a137bb01aff7d59fc93161ec0d /src/server/scripts/OutdoorPvP
parentf09af7058338d765db87b25acc275ac711765305 (diff)
parent96c6ed1867c2a03e003147bff45faf588da21be2 (diff)
Merge pull request #14491 from doctaweeks/fixes-for-6.x
Fixes for 6.x
Diffstat (limited to 'src/server/scripts/OutdoorPvP')
-rw-r--r--src/server/scripts/OutdoorPvP/OutdoorPvPZM.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
index ca1925f088b..76e4cc71d1f 100644
--- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
+++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.h
@@ -184,11 +184,11 @@ 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(WorldPackets::WorldState::InitWorldStates& packet);
+ void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override;
void UpdateTowerState();
@@ -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;