diff options
| author | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-12-26 22:32:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-26 22:32:01 +0100 |
| commit | 3b2c878dd067f49ee48ddfc27c62eb4e1fe619d9 (patch) | |
| tree | ee44efef2fba97af61bed899c0ad29c5e35a017d /src/server/game/Entities/GameObject | |
| parent | e8b78acbee35b63f4f19fdcfdf4915cf9d784b27 (diff) | |
Core/Spells: Implemented personal summons (#19231) (#25765)
* Core/Spells: Implemented personal summons (#19231)
* By default determined by summon property flag SUMMON_PROP_FLAG_PERSONAL_SPAWN
Closes #18254
(cherry picked from commit b7bb5e6a98119512702519adecf559ecedc20743)
# Conflicts:
# src/server/game/Combat/ThreatManager.cpp
# src/server/game/DataStores/DBCEnums.h
# src/server/game/Entities/Creature/TemporarySummon.cpp
# src/server/game/Entities/Creature/TemporarySummon.h
# src/server/game/Entities/GameObject/GameObject.cpp
# src/server/game/Entities/Object/Object.cpp
# src/server/game/Entities/Object/Object.h
# src/server/game/Maps/Map.h
# src/server/game/Spells/SpellEffects.cpp
* Build fix
* Implement feedback
* Fix parameters passed in wrong order
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index a9bed61c0b7..53ebcef7d12 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2660,7 +2660,7 @@ void GameObject::UpdateModelPosition() class GameObjectModelOwnerImpl : public GameObjectModelOwnerBase { public: - explicit GameObjectModelOwnerImpl(GameObject const* owner) : _owner(owner) { } + explicit GameObjectModelOwnerImpl(GameObject* owner) : _owner(owner) { } bool IsSpawned() const override { return _owner->isSpawned(); } uint32 GetDisplayId() const override { return _owner->GetDisplayId(); } @@ -2671,7 +2671,7 @@ public: void DebugVisualizeCorner(G3D::Vector3 const& corner) const override { const_cast<GameObject*>(_owner)->SummonCreature(1, corner.x, corner.y, corner.z, 0, TEMPSUMMON_MANUAL_DESPAWN); } private: - GameObject const* _owner; + GameObject* _owner; }; GameObjectModel* GameObject::CreateModel() |