diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-29 17:05:16 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-29 17:05:16 +0200 |
| commit | 1d620f4b6740ba7e44fd7885462c7ef040a89f77 (patch) | |
| tree | cea8dd2512beda0e5e973df75c17c08401aeaa8d /src/Collision.cpp | |
| parent | more replay stuff, bug fix (diff) | |
| parent | fix (diff) | |
| download | re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.tar re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.tar.gz re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.tar.bz2 re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.tar.lz re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.tar.xz re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.tar.zst re3-1d620f4b6740ba7e44fd7885462c7ef040a89f77.zip | |
Diffstat (limited to 'src/Collision.cpp')
| -rw-r--r-- | src/Collision.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Collision.cpp b/src/Collision.cpp index 95e6626a..6189a3fc 100644 --- a/src/Collision.cpp +++ b/src/Collision.cpp @@ -15,6 +15,7 @@ #include "Population.h" #include "FileLoader.h" #include "Replay.h" +#include "CutsceneMgr.h" #include "RenderBuffer.h" #include "SurfaceTable.h" #include "Collision.h" @@ -49,10 +50,13 @@ void CCollision::Update(void) { CVector playerCoors; - FindPlayerCoors(playerCoors); + playerCoors = FindPlayerCoors(); eLevelName level = CTheZones::m_CurrLevel; bool forceLevelChange = false; + if(CTimer::GetTimeInMilliseconds() < 2000 || CCutsceneMgr::IsCutsceneProcessing()) + return; + // hardcode a level if there are no zones if(level == LEVEL_NONE){ if(CGame::currLevel == LEVEL_INDUSTRIAL && @@ -130,7 +134,7 @@ CCollision::LoadCollisionWhenINeedIt(bool forceChange) level = LEVEL_NONE; - FindPlayerCoors(playerCoors); + playerCoors = FindPlayerCoors(); sx = CWorld::GetSectorIndexX(playerCoors.x); sy = CWorld::GetSectorIndexY(playerCoors.y); multipleLevels = false; |