aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjoschiwald <joschiwald.trinity@gmail.com>2018-01-28 23:34:14 +0100
committerjoschiwald <joschiwald.trinity@gmail.com>2018-01-28 23:34:14 +0100
commitdc43a08d369ef9c52b3425754545385962a2ffde (patch)
tree5bc6dde9cbd13c8b5762af180949f5ff9529974b /src
parentc4bf996c7d23fdfdb73d411d3f49a394b37d4d21 (diff)
Core/Misc: Fixed new-delete-type-mismatch issue reported by AddressSanitizer
Diffstat (limited to 'src')
-rw-r--r--src/common/Collision/Models/GameObjectModel.h2
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/common/Collision/Models/GameObjectModel.h b/src/common/Collision/Models/GameObjectModel.h
index dc7db8e4c23..1e42da90d85 100644
--- a/src/common/Collision/Models/GameObjectModel.h
+++ b/src/common/Collision/Models/GameObjectModel.h
@@ -39,6 +39,8 @@ struct GameObjectDisplayInfoEntry;
class TC_COMMON_API GameObjectModelOwnerBase
{
public:
+ virtual ~GameObjectModelOwnerBase() = default;
+
virtual bool IsSpawned() const { return false; }
virtual uint32 GetDisplayId() const { return 0; }
virtual bool IsInPhase(std::set<uint32> const& /*phases*/) const { return false; }
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index ba2d4501301..59773082cce 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -2619,6 +2619,7 @@ class GameObjectModelOwnerImpl : public GameObjectModelOwnerBase
{
public:
explicit GameObjectModelOwnerImpl(GameObject const* owner) : _owner(owner) { }
+ virtual ~GameObjectModelOwnerImpl() = default;
virtual bool IsSpawned() const override { return _owner->isSpawned(); }
virtual uint32 GetDisplayId() const override { return _owner->GetDisplayId(); }