diff options
| author | Carbenium <keresztesschmidt@gmail.com> | 2015-04-05 00:16:36 +0200 |
|---|---|---|
| committer | Carbenium <keresztesschmidt@gmail.com> | 2015-04-05 00:16:36 +0200 |
| commit | 6252330a772b49046be84ad7d16c8c3ce94de841 (patch) | |
| tree | a74839bee1cac6a137bb01aff7d59fc93161ec0d /src/server/game/Entities/GameObject | |
| parent | f09af7058338d765db87b25acc275ac711765305 (diff) | |
| parent | 96c6ed1867c2a03e003147bff45faf588da21be2 (diff) | |
Merge pull request #14491 from doctaweeks/fixes-for-6.x
Fixes for 6.x
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.h b/src/server/game/Entities/GameObject/GameObject.h index 8ff2a941901..02349990d12 100644 --- a/src/server/game/Entities/GameObject/GameObject.h +++ b/src/server/game/Entities/GameObject/GameObject.h @@ -952,7 +952,7 @@ 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, ObjectGuid::LowType lowguid = UI64LIT(0)); - bool SetInPhase(uint32 id, bool update, bool apply); + bool SetInPhase(uint32 id, bool update, bool apply) override; void EnableCollision(bool enable); void Use(Unit* user); |