aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps
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/Maps
parent272b9d3d16cda66abb951596c87eb655d196e354 (diff)
Core/Server: Add missing overrides
Diffstat (limited to 'src/server/game/Maps')
-rw-r--r--src/server/game/Maps/Map.h22
-rw-r--r--src/server/game/Maps/MapInstanced.h10
-rw-r--r--src/server/game/Maps/MapReference.h6
3 files changed, 19 insertions, 19 deletions
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 70198cb20a3..9245e809daa 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -678,23 +678,23 @@ class InstanceMap : public Map
public:
InstanceMap(uint32 id, time_t, uint32 InstanceId, uint8 SpawnMode, Map* _parent);
~InstanceMap();
- bool AddPlayerToMap(Player*);
- void RemovePlayerFromMap(Player*, bool);
- void Update(const uint32);
+ bool AddPlayerToMap(Player*) override;
+ void RemovePlayerFromMap(Player*, bool) override;
+ void Update(const uint32) override;
void CreateInstanceData(bool load);
bool Reset(uint8 method);
uint32 GetScriptId() { return i_script_id; }
InstanceScript* GetInstanceScript() { return i_data; }
void PermBindAllPlayers(Player* source);
- void UnloadAll();
- bool CanEnter(Player* player);
+ void UnloadAll() override;
+ bool CanEnter(Player* player) override;
void SendResetWarnings(uint32 timeLeft) const;
void SetResetSchedule(bool on);
uint32 GetMaxPlayers() const;
uint32 GetMaxResetDelay() const;
- virtual void InitVisibilityDistance();
+ virtual void InitVisibilityDistance() override;
private:
bool m_resetAfterUnload;
bool m_unloadWhenEmpty;
@@ -708,14 +708,14 @@ class BattlegroundMap : public Map
BattlegroundMap(uint32 id, time_t, uint32 InstanceId, Map* _parent, uint8 spawnMode);
~BattlegroundMap();
- bool AddPlayerToMap(Player*);
- void RemovePlayerFromMap(Player*, bool);
- bool CanEnter(Player* player);
+ bool AddPlayerToMap(Player*) override;
+ void RemovePlayerFromMap(Player*, bool) override;
+ bool CanEnter(Player* player) override;
void SetUnload();
//void UnloadAll(bool pForce);
- void RemoveAllPlayers();
+ void RemoveAllPlayers() override;
- virtual void InitVisibilityDistance();
+ virtual void InitVisibilityDistance() override;
Battleground* GetBG() { return m_bg; }
void SetBG(Battleground* bg) { m_bg = bg; }
private:
diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h
index 30aec43cc21..614764dbba3 100644
--- a/src/server/game/Maps/MapInstanced.h
+++ b/src/server/game/Maps/MapInstanced.h
@@ -33,11 +33,11 @@ class MapInstanced : public Map
~MapInstanced() { }
// functions overwrite Map versions
- void Update(const uint32);
- void DelayedUpdate(const uint32 diff);
+ void Update(const uint32) override;
+ void DelayedUpdate(const uint32 diff) override;
//void RelocationNotify();
- void UnloadAll();
- bool CanEnter(Player* player);
+ void UnloadAll() override;
+ bool CanEnter(Player* player) override;
Map* CreateInstanceForPlayer(const uint32 mapId, Player* player);
Map* FindInstanceMap(uint32 instanceId) const
@@ -61,7 +61,7 @@ class MapInstanced : public Map
}
InstancedMaps &GetInstancedMaps() { return m_InstancedMaps; }
- virtual void InitVisibilityDistance();
+ virtual void InitVisibilityDistance() override;
private:
InstanceMap* CreateInstance(uint32 InstanceId, InstanceSave* save, Difficulty difficulty);
diff --git a/src/server/game/Maps/MapReference.h b/src/server/game/Maps/MapReference.h
index fe5ceb714c5..2742902d558 100644
--- a/src/server/game/Maps/MapReference.h
+++ b/src/server/game/Maps/MapReference.h
@@ -25,18 +25,18 @@
class MapReference : public Reference<Map, Player>
{
protected:
- void targetObjectBuildLink()
+ void targetObjectBuildLink() override
{
// called from link()
getTarget()->m_mapRefManager.insertFirst(this);
getTarget()->m_mapRefManager.incSize();
}
- void targetObjectDestroyLink()
+ void targetObjectDestroyLink() override
{
// called from unlink()
if (isValid()) getTarget()->m_mapRefManager.decSize();
}
- void sourceObjectDestroyLink()
+ void sourceObjectDestroyLink() override
{
// called from invalidate()
getTarget()->m_mapRefManager.decSize();