diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:42 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:42 +0100 |
| commit | ef9bc5b17b3ad4f3bdfbd67c937b90d8d1dcd3eb (patch) | |
| tree | 9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/collision/Models/GameObjectModel.cpp | |
| parent | d268b81044707e15266eadb4ab49f176135d4c26 (diff) | |
| parent | ac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (diff) | |
Merge branch 'Intel-dbc' into 6.x
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 bb2837be4c4..0e8811d43d1 100644 --- a/src/server/collision/Models/GameObjectModel.cpp +++ b/src/server/collision/Models/GameObjectModel.cpp @@ -96,7 +96,7 @@ GameObjectModel::~GameObjectModel() bool GameObjectModel::initialize(const GameObject& go, const GameObjectDisplayInfoEntry& info) { - ModelList::const_iterator it = model_list.find(info.Displayid); + ModelList::const_iterator it = model_list.find(info.ID); if (it == model_list.end()) return false; |