diff options
| author | Subv <subv2112@gmail.com> | 2014-06-07 20:26:25 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-06-07 20:26:25 -0500 |
| commit | bbe51bbd130908603c0a5c0c5d14eae2f0495ede (patch) | |
| tree | f04e966b310881aeacde5149df697ebc612f01f3 /src/server/game/Entities/GameObject | |
| parent | 402b9b055c6a32ee0e105abc103aac18c0ad33ee (diff) | |
Core/Phases: Removed more of the old phasemasks
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 7 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 8cf12405969..9b931f0ba6a 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -2068,13 +2068,6 @@ void GameObject::SetInPhase(uint32 id, bool update, bool apply) EnableCollision(true); } -void GameObject::SetPhaseMask(uint32 newPhaseMask, bool update) -{ - WorldObject::SetPhaseMask(newPhaseMask, update); - if (m_model && m_model->isEnabled()) - EnableCollision(true); -} - void GameObject::EnableCollision(bool enable) { if (!m_model) diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 2b24f29fe69..32ef5a44d6c 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -726,7 +726,6 @@ class GameObject : public WorldObject, public GridObject<GameObject>, public Map void SetGoAnimProgress(uint8 animprogress) { SetByteValue(GAMEOBJECT_BYTES_1, 3, animprogress); } static void SetGoArtKit(uint8 artkit, GameObject* go, uint32 lowguid = 0); - void SetPhaseMask(uint32 newPhaseMask, bool update); void SetInPhase(uint32 id, bool update, bool apply); void EnableCollision(bool enable); |
