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/World | |
| 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/World')
| -rw-r--r-- | src/server/game/World/World.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 6bef94cc379..d84fe11383f 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -66,7 +66,7 @@ #include "WaypointMovementGenerator.h" #include "WeatherMgr.h" #include "WorldSession.h" - +#include "M2Stores.h" TC_GAME_API std::atomic<bool> World::m_stopEvent(false); TC_GAME_API uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE; @@ -1404,6 +1404,9 @@ void World::SetInitialWorldSettings() LoadDBCStores(m_dataPath); DetectDBCLang(); + // Load cinematic cameras + LoadM2Cameras(m_dataPath); + std::vector<uint32> mapIds; for (uint32 mapId = 0; mapId < sMapStore.GetNumRows(); mapId++) if (sMapStore.LookupEntry(mapId)) |