aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Maps
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-02-12 21:36:46 +0100
committerShauren <shauren.trinity@gmail.com>2022-02-12 21:36:46 +0100
commitf8ad7017dd69e3853ed5912ac6151bc56b6265a0 (patch)
tree13c6568cf2e7b3a7ccb964b12f6686651f0e714d /src/server/game/Maps
parent5b28a5ab14f3ca25f986d547e2d2005be3f047b7 (diff)
Core/Misc: Move (or delete) constructors and destructors to .cpp files (avoids compiling them in every file that includes them)
Diffstat (limited to 'src/server/game/Maps')
-rw-r--r--src/server/game/Maps/MapInstanced.cpp2
-rw-r--r--src/server/game/Maps/MapInstanced.h9
-rw-r--r--src/server/game/Maps/ZoneScript.cpp8
-rw-r--r--src/server/game/Maps/ZoneScript.h9
4 files changed, 23 insertions, 5 deletions
diff --git a/src/server/game/Maps/MapInstanced.cpp b/src/server/game/Maps/MapInstanced.cpp
index 32aac9c1878..da3356911ad 100644
--- a/src/server/game/Maps/MapInstanced.cpp
+++ b/src/server/game/Maps/MapInstanced.cpp
@@ -35,6 +35,8 @@ MapInstanced::MapInstanced(uint32 id, time_t expiry) : Map(id, expiry, 0, DIFFIC
{
}
+MapInstanced::~MapInstanced() = default;
+
void MapInstanced::InitVisibilityDistance()
{
if (m_InstancedMaps.empty())
diff --git a/src/server/game/Maps/MapInstanced.h b/src/server/game/Maps/MapInstanced.h
index e6aaefe7c18..6b2b71ed37e 100644
--- a/src/server/game/Maps/MapInstanced.h
+++ b/src/server/game/Maps/MapInstanced.h
@@ -20,7 +20,6 @@
#include "Map.h"
#include "InstanceSaveMgr.h"
-#include "DBCEnums.h"
class GarrisonMap;
@@ -31,9 +30,13 @@ class TC_GAME_API MapInstanced : public Map
typedef std::unordered_map< uint32, Map*> InstancedMaps;
MapInstanced(uint32 id, time_t expiry);
- ~MapInstanced() { }
+ MapInstanced(MapInstanced const& right) = delete;
+ MapInstanced(MapInstanced&& right) = delete;
+ MapInstanced& operator=(MapInstanced const& right) = delete;
+ MapInstanced& operator=(MapInstanced&& right) = delete;
+ ~MapInstanced();
- // functions overwrite Map versions
+ // functions overwrite Map versions
void Update(uint32 diff) override;
void DelayedUpdate(uint32 diff) override;
//void RelocationNotify();
diff --git a/src/server/game/Maps/ZoneScript.cpp b/src/server/game/Maps/ZoneScript.cpp
index 5117eee7f7d..974a6c7661f 100644
--- a/src/server/game/Maps/ZoneScript.cpp
+++ b/src/server/game/Maps/ZoneScript.cpp
@@ -18,6 +18,14 @@
#include "ZoneScript.h"
#include "Creature.h"
+ZoneScript::ZoneScript()
+{
+}
+
+ZoneScript::~ZoneScript()
+{
+}
+
uint32 ZoneScript::GetCreatureEntry(ObjectGuid::LowType /*guidLow*/, CreatureData const* data)
{
return data->id;
diff --git a/src/server/game/Maps/ZoneScript.h b/src/server/game/Maps/ZoneScript.h
index ad308f7122d..8d3bb397a07 100644
--- a/src/server/game/Maps/ZoneScript.h
+++ b/src/server/game/Maps/ZoneScript.h
@@ -30,8 +30,13 @@ struct CreatureData;
class TC_GAME_API ZoneScript
{
public:
- ZoneScript() { }
- virtual ~ZoneScript() { }
+ ZoneScript();
+ virtual ~ZoneScript();
+
+ ZoneScript(ZoneScript const& right) = delete;
+ ZoneScript(ZoneScript&& right) = delete;
+ ZoneScript& operator=(ZoneScript const& right) = delete;
+ ZoneScript& operator=(ZoneScript&& right) = delete;
virtual uint32 GetCreatureEntry(ObjectGuid::LowType /*spawnId*/, CreatureData const* data);
virtual uint32 GetGameObjectEntry(ObjectGuid::LowType /*spawnId*/, uint32 entry) { return entry; }