diff options
| author | r00ty-tc <r00ty-tc@users.noreply.github.com> | 2016-05-11 10:51:15 +0100 |
|---|---|---|
| committer | r00ty-tc <r00ty-tc@users.noreply.github.com> | 2016-05-11 11:56:25 +0200 |
| commit | de918a0f644794beebff2234b53980b577b27e39 (patch) | |
| tree | 54d21dce2d9014bf39380958f8c172a1f316a0ae /src/server/game/Entities/Object | |
| parent | 7e48a023989e50920fe2e115cb57d25095071a17 (diff) | |
Core/Maps - Improvements to Cinematic function
- Moves to own class for reading, storage and player subclass
- Proper destruction handling for player (ensure cinematic is ended)
- Timeout for cinematic if it reaches past the end without completing
- boost::filesystem::path used for path/filename transform
- Correct for assert trigger under certain circumstances
- Other changes previously suggested
Diffstat (limited to 'src/server/game/Entities/Object')
| -rw-r--r-- | src/server/game/Entities/Object/Object.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 45952ba51ac..a2f519a681c 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1471,7 +1471,7 @@ float WorldObject::GetGridActivationRange() const { if (ToPlayer()) { - if (ToPlayer()->IsOnCinematic()) + if (ToPlayer()->GetCinematicMgr()->IsOnCinematic()) return DEFAULT_VISIBILITY_INSTANCE; return GetMap()->GetVisibilityRange(); } @@ -1504,7 +1504,7 @@ float WorldObject::GetSightRange(const WorldObject* target) const { if (target && target->isActiveObject() && !target->ToPlayer()) return MAX_VISIBILITY_DISTANCE; - else if (ToPlayer()->IsOnCinematic()) + else if (ToPlayer()->GetCinematicMgr()->IsOnCinematic()) return DEFAULT_VISIBILITY_INSTANCE; else return GetMap()->GetVisibilityRange(); |