aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Battlefield
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2014-08-09 20:17:40 +0100
committerDDuarte <dnpd.dd@gmail.com>2014-08-09 20:17:40 +0100
commita394205eca86d2ea2a8539734df49432189bc73b (patch)
tree124f8f2f15bd6961c91d7e042f941d3222ad50e9 /src/server/game/Battlefield
parent272b9d3d16cda66abb951596c87eb655d196e354 (diff)
Core/Server: Add missing overrides
Diffstat (limited to 'src/server/game/Battlefield')
-rw-r--r--src/server/game/Battlefield/Battlefield.h8
-rw-r--r--src/server/game/Battlefield/Zones/BattlefieldWG.h40
2 files changed, 24 insertions, 24 deletions
diff --git a/src/server/game/Battlefield/Battlefield.h b/src/server/game/Battlefield/Battlefield.h
index 15498d1f045..c6bfee40cd2 100644
--- a/src/server/game/Battlefield/Battlefield.h
+++ b/src/server/game/Battlefield/Battlefield.h
@@ -245,12 +245,12 @@ class Battlefield : public ZoneScript
void HandlePlayerLeaveZone(Player* player, uint32 zone);
// All-purpose data storage 64 bit
- virtual uint64 GetData64(uint32 dataId) const { return m_Data64[dataId]; }
- virtual void SetData64(uint32 dataId, uint64 value) { m_Data64[dataId] = value; }
+ virtual uint64 GetData64(uint32 dataId) const override { return m_Data64[dataId]; }
+ virtual void SetData64(uint32 dataId, uint64 value) override { m_Data64[dataId] = value; }
// All-purpose data storage 32 bit
- virtual uint32 GetData(uint32 dataId) const { return m_Data32[dataId]; }
- virtual void SetData(uint32 dataId, uint32 value) { m_Data32[dataId] = value; }
+ virtual uint32 GetData(uint32 dataId) const override { return m_Data32[dataId]; }
+ virtual void SetData(uint32 dataId, uint32 value) override { m_Data32[dataId] = value; }
virtual void UpdateData(uint32 index, int32 pad) { m_Data32[index] += pad; }
// Battlefield - generic methods
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.h b/src/server/game/Battlefield/Zones/BattlefieldWG.h
index 0ba9e816b2e..341ccdeb44c 100644
--- a/src/server/game/Battlefield/Zones/BattlefieldWG.h
+++ b/src/server/game/Battlefield/Zones/BattlefieldWG.h
@@ -255,7 +255,7 @@ class WintergraspCapturePoint : public BfCapturePoint
void LinkToWorkshop(WGWorkshop* workshop) { m_Workshop = workshop; }
- void ChangeTeam(TeamId oldteam);
+ void ChangeTeam(TeamId oldteam) override;
TeamId GetTeam() const { return m_team; }
protected:
@@ -276,7 +276,7 @@ class BattlefieldWG : public Battlefield
* - Rebuild tower and wall
* - Invite player to war
*/
- void OnBattleStart();
+ void OnBattleStart() override;
/**
* \brief Called when battle end
@@ -287,13 +287,13 @@ class BattlefieldWG : public Battlefield
* - Remove vehicle
* \param endByTimer : true if battle ended when timer is at 00:00, false if battle ended by clicking on relic
*/
- void OnBattleEnd(bool endByTimer);
+ void OnBattleEnd(bool endByTimer) override;
/**
* \brief Called when grouping starts (15 minutes before battlestart)
* - Invite all player in zone to join queue
*/
- void OnStartGrouping();
+ void OnStartGrouping() override;
/**
* \brief Called when player accept invite to join battle
@@ -303,20 +303,20 @@ class BattlefieldWG : public Battlefield
* - Update tenacity
* \param player: Player who accepted invite
*/
- void OnPlayerJoinWar(Player* player);
+ void OnPlayerJoinWar(Player* player) override;
/**
* \brief Called when player left the battle
* - Update player aura
* \param player : Player who left the battle
*/
- void OnPlayerLeaveWar(Player* player);
+ void OnPlayerLeaveWar(Player* player) override;
/**
* \brief Called when player left the WG zone
* \param player : Player who left the zone
*/
- void OnPlayerLeaveZone(Player* player);
+ void OnPlayerLeaveZone(Player* player) override;
/**
* \brief Called when player enters in WG zone
@@ -324,7 +324,7 @@ class BattlefieldWG : public Battlefield
* - Update worldstate
* \param player : Player who enters the zone
*/
- void OnPlayerEnterZone(Player* player);
+ void OnPlayerEnterZone(Player* player) override;
/**
* \brief Called for update battlefield data
@@ -332,24 +332,24 @@ class BattlefieldWG : public Battlefield
* - Update imunity aura from graveyard
* \param diff : time elapsed since the last call (in ms)
*/
- bool Update(uint32 diff);
+ bool Update(uint32 diff) override;
/**
* \brief Called when a creature is created
* - Update vehicle count
*/
- void OnCreatureCreate(Creature* creature);
+ void OnCreatureCreate(Creature* creature) override;
/**
* \brief Called when a creature is removed
* - Update vehicle count
*/
- void OnCreatureRemove(Creature* creature);
+ void OnCreatureRemove(Creature* creature) override;
/**
* \brief Called when a gameobject is created
*/
- void OnGameObjectCreate(GameObject* go);
+ void OnGameObjectCreate(GameObject* go) override;
/**
* \brief Called when a wall/tower is broken
@@ -370,14 +370,14 @@ class BattlefieldWG : public Battlefield
*/
void UpdatedDestroyedTowerCount(TeamId team);
- void DoCompleteOrIncrementAchievement(uint32 achievement, Player* player, uint8 incrementNumber = 1);
+ void DoCompleteOrIncrementAchievement(uint32 achievement, Player* player, uint8 incrementNumber = 1) override;
void RemoveAurasFromPlayer(Player* player);
/**
* \brief Called when battlefield is setup, at server start
*/
- bool SetupBattlefield();
+ bool SetupBattlefield() override;
/// Return pointer to relic object
GameObject* GetRelic() { return GetGameObject(m_titansRelicGUID); }
@@ -395,22 +395,22 @@ class BattlefieldWG : public Battlefield
void UpdateCounterVehicle(bool init);
void SendInitWorldStatesTo(Player* player);
- void SendInitWorldStatesToAll();
- void FillInitialWorldStates(WorldPacket& data);
+ void SendInitWorldStatesToAll() override;
+ void FillInitialWorldStates(WorldPacket& data) override;
- void HandleKill(Player* killer, Unit* victim);
- void OnUnitDeath(Unit* unit);
+ void HandleKill(Player* killer, Unit* victim) override;
+ void OnUnitDeath(Unit* unit) override;
void PromotePlayer(Player* killer);
void UpdateTenacity();
- void ProcessEvent(WorldObject* obj, uint32 eventId);
+ void ProcessEvent(WorldObject* obj, uint32 eventId) override;
bool FindAndRemoveVehicleFromList(Unit* vehicle);
// returns the graveyardId in the specified area.
uint8 GetSpiritGraveyardId(uint32 areaId) const;
- uint32 GetData(uint32 data) const;
+ uint32 GetData(uint32 data) const override;
protected:
bool m_isRelicInteractible;