summaryrefslogtreecommitdiffstats
path: root/src/Collision.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-29 11:57:47 +0200
committeraap <aap@papnet.eu>2019-06-29 11:57:47 +0200
commit4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6 (patch)
tree91ac31688b70ff0cdd29d39f9191e6e22bdc07f6 /src/Collision.cpp
parentMerge branch 'master' of github.com:GTAmodding/re3 (diff)
downloadre3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.tar
re3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.tar.gz
re3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.tar.bz2
re3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.tar.lz
re3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.tar.xz
re3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.tar.zst
re3-4bce84df4d1ab2bad471ea0a08d5f42d01cd5fd6.zip
Diffstat (limited to 'src/Collision.cpp')
-rw-r--r--src/Collision.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Collision.cpp b/src/Collision.cpp
index c7593a04..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"
@@ -53,6 +54,9 @@ CCollision::Update(void)
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 &&