From 45fcc2ff9d7df9b86b53fbfea106b827c4ac46de Mon Sep 17 00:00:00 2001 From: Trisjdc Date: Sun, 25 May 2014 11:34:26 +0100 Subject: Core/Collision: Solve collision issues with non spawned GOs --- src/server/collision/Models/GameObjectModel.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server/collision/Models/GameObjectModel.h') diff --git a/src/server/collision/Models/GameObjectModel.h b/src/server/collision/Models/GameObjectModel.h index 6088b924343..99c9b1337b3 100644 --- a/src/server/collision/Models/GameObjectModel.h +++ b/src/server/collision/Models/GameObjectModel.h @@ -44,8 +44,9 @@ class GameObjectModel /*, public Intersectable*/ float iInvScale; float iScale; VMAP::WorldModel* iModel; + GameObject const* owner; - GameObjectModel() : phasemask(0), iInvScale(0), iScale(0), iModel(NULL) { } + GameObjectModel() : phasemask(0), iInvScale(0), iScale(0), iModel(NULL), owner(NULL) { } bool initialize(const GameObject& go, const GameObjectDisplayInfoEntry& info); public: -- cgit v1.2.3