diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-05-25 21:52:27 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-05-25 21:52:27 +0200 |
| commit | 15efe08a60d3ccb277dde03abc6cce562ad0b44b (patch) | |
| tree | 9c2a48c3e55a000205ed0f3159d0684f29a0d994 /src/server/collision/Models/GameObjectModel.h | |
| parent | 49a17c6282fac3d2636e3db740b1a6960fb387ba (diff) | |
| parent | c06dc7d37aa8c795ff505550a7bc388d2a66ecac (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
Diffstat (limited to 'src/server/collision/Models/GameObjectModel.h')
| -rw-r--r-- | src/server/collision/Models/GameObjectModel.h | 3 |
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: |