diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-23 22:17:12 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-23 22:17:12 +0100 |
| commit | 1f79ac8c304d136933eba86391652d552082ed1f (patch) | |
| tree | 019678a3f50988db36182e62893abd624cd57aaf /src/server/collision/Models/GameObjectModel.cpp | |
| parent | 95d713ac6f53a270be879b6661c3d988607261c5 (diff) | |
| parent | a7386bd1b3e0c53b41473326eb42d8a06cacbf96 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Diffstat (limited to 'src/server/collision/Models/GameObjectModel.cpp')
| -rw-r--r-- | src/server/collision/Models/GameObjectModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/Models/GameObjectModel.cpp b/src/server/collision/Models/GameObjectModel.cpp index 6cb0f90d98e..d8c39925dc6 100644 --- a/src/server/collision/Models/GameObjectModel.cpp +++ b/src/server/collision/Models/GameObjectModel.cpp @@ -148,7 +148,7 @@ bool GameObjectModel::initialize(const GameObject& go, const GameObjectDisplayIn GameObjectModel* GameObjectModel::Create(const GameObject& go) { - const GameObjectDisplayInfoEntry* info = sGameObjectDisplayInfoStore.LookupEntry(go.GetGOInfo()->displayId); + const GameObjectDisplayInfoEntry* info = sGameObjectDisplayInfoStore.LookupEntry(go.GetDisplayId()); if (!info) return NULL; |