diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-03 23:11:48 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-03 23:11:48 +0100 |
| commit | 66dfcd2b43286829a200a52aac83d57aac88f140 (patch) | |
| tree | 8b650e6e13676d191d9848ceff4410005accaff0 /src/server/collision/Models/GameObjectModel.cpp | |
| parent | 06041bc42309320323a1d18864c53e2388f9f42b (diff) | |
| parent | 0d1e199e1fdc096c7d88915b78611856c6934631 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Object/Object.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
Diffstat (limited to 'src/server/collision/Models/GameObjectModel.cpp')
| -rw-r--r-- | src/server/collision/Models/GameObjectModel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/collision/Models/GameObjectModel.cpp b/src/server/collision/Models/GameObjectModel.cpp index 54283389387..e166a860cd2 100644 --- a/src/server/collision/Models/GameObjectModel.cpp +++ b/src/server/collision/Models/GameObjectModel.cpp @@ -48,7 +48,10 @@ ModelList model_list; void LoadGameObjectModelList() { +#ifndef NO_CORE_FUNCS uint32 oldMSTime = getMSTime(); +#endif + FILE* model_list_file = fopen((sWorld->GetDataPath() + "vmaps/" + VMAP::GAMEOBJECT_MODELS).c_str(), "rb"); if (!model_list_file) { |