summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorRoman Masanin <36927roma@gmail.com>2020-10-09 19:29:38 +0200
committerRoman Masanin <36927roma@gmail.com>2020-10-09 19:29:38 +0200
commit881db86895dd5427efd3962909214be06270e1ab (patch)
treef86b91e5f1497701991eba2dffc116bd4547d6df /src/core
parentMerge pull request #750 from erorcun/miami (diff)
downloadre3-881db86895dd5427efd3962909214be06270e1ab.tar
re3-881db86895dd5427efd3962909214be06270e1ab.tar.gz
re3-881db86895dd5427efd3962909214be06270e1ab.tar.bz2
re3-881db86895dd5427efd3962909214be06270e1ab.tar.lz
re3-881db86895dd5427efd3962909214be06270e1ab.tar.xz
re3-881db86895dd5427efd3962909214be06270e1ab.tar.zst
re3-881db86895dd5427efd3962909214be06270e1ab.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Timer.cpp3
-rw-r--r--src/core/main.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/Timer.cpp b/src/core/Timer.cpp
index f60adf07..5adc36b5 100644
--- a/src/core/Timer.cpp
+++ b/src/core/Timer.cpp
@@ -5,6 +5,7 @@
#include "DMAudio.h"
#include "Record.h"
#include "Timer.h"
+#include "SpecialFX.h"
uint32 CTimer::m_snTimeInMilliseconds;
PauseModeTime CTimer::m_snTimeInMillisecondsPauseMode = 1;
@@ -141,7 +142,7 @@ void CTimer::Update(void)
}
}
- if ( ms_fTimeStep < 0.01f && !GetIsPaused() )
+ if ( ms_fTimeStep < 0.01f && !GetIsPaused() && !CSpecialFX::bSnapShotActive)
ms_fTimeStep = 0.01f;
ms_fTimeStepNonClipped = ms_fTimeStep;
diff --git a/src/core/main.cpp b/src/core/main.cpp
index b39a9c8b..fa5a5000 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -969,7 +969,7 @@ Render2dStuff(void)
else
CHud::Draw();
// TODO(Miami)
- // CSpecialFX::Render2DFXs();
+ CSpecialFX::Render2DFXs();
CUserDisplay::OnscnTimer.ProcessForDisplay();
CMessages::Display();
CDarkel::DrawMessages();