aboutsummaryrefslogtreecommitdiff
path: root/src/server/collision/Models/GameObjectModel.h
diff options
context:
space:
mode:
authorTrisjdc <trisjdc@gmail.com>2014-05-25 11:34:26 +0100
committerTrisjdc <trisjdc@gmail.com>2014-05-25 11:34:26 +0100
commit45fcc2ff9d7df9b86b53fbfea106b827c4ac46de (patch)
tree4bc7f60e1131e6fa1321c27669a94cbf9cdc1c2d /src/server/collision/Models/GameObjectModel.h
parentf091713086eab1ef928bc2f79eb0dc3b0bc4ce2f (diff)
Core/Collision: Solve collision issues with non spawned GOs
Diffstat (limited to 'src/server/collision/Models/GameObjectModel.h')
-rw-r--r--src/server/collision/Models/GameObjectModel.h3
1 files changed, 2 insertions, 1 deletions
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: