From daaf443cfaa0532aad8a0ede0cad826c66650593 Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 7 Apr 2020 22:26:01 +0200
Subject: finished CMotionBlurStreaks, CSpecialFX

---
 src/core/config.h |  1 +
 src/core/main.cpp | 38 +++++++++++++++++++-------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

(limited to 'src/core')

diff --git a/src/core/config.h b/src/core/config.h
index 1dc6abe9..dfc454a8 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -78,6 +78,7 @@ enum Config {
 	NUMMONEYMESSAGES = 16,
 	NUMPICKUPMESSAGES = 16,
 	NUMBULLETTRACES = 16,
+	NUMMBLURSTREAKS = 4,
 
 	NUMONSCREENTIMERENTRIES = 1,
 	NUMRADARBLIPS = 32,
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 674527f5..fb5beee0 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -162,17 +162,17 @@ Idle(void *arg)
 	} else {
 		CPointLights::InitPerFrame();
 #ifdef TIMEBARS
-		tbStartTimer(0, "CGame::Process");
+		tbStartTimer(0, "CGame::Process");
 #endif
 		CGame::Process();
 #ifdef TIMEBARS
 		tbEndTimer("CGame::Process");
-		tbStartTimer(0, "DMAudio.Service");
+		tbStartTimer(0, "DMAudio.Service");
 #endif
 		DMAudio.Service();
 
 #ifdef TIMEBARS
-		tbEndTimer("DMAudio.Service");
+		tbEndTimer("DMAudio.Service");
 #endif
 	}
 
@@ -181,18 +181,18 @@ Idle(void *arg)
 #else
 	CPointLights::InitPerFrame();
 #ifdef TIMEBARS
-	tbStartTimer(0, "CGame::Process");
+	tbStartTimer(0, "CGame::Process");
 #endif
 	CGame::Process();
 #ifdef TIMEBARS
 	tbEndTimer("CGame::Process");
-	tbStartTimer(0, "DMAudio.Service");
+	tbStartTimer(0, "DMAudio.Service");
 #endif
 
 	DMAudio.Service();
 
 #ifdef TIMEBARS
-	tbEndTimer("DMAudio.Service");
+	tbEndTimer("DMAudio.Service");
 #endif
 #endif
 
@@ -222,16 +222,16 @@ Idle(void *arg)
 		}
 #endif
 #ifdef TIMEBARS
-		tbStartTimer(0, "CnstrRenderList");
+		tbStartTimer(0, "CnstrRenderList");
 #endif
 		CRenderer::ConstructRenderList();
 #ifdef TIMEBARS
 		tbEndTimer("CnstrRenderList");
-		tbStartTimer(0, "PreRender");
+		tbStartTimer(0, "PreRender");
 #endif
 		CRenderer::PreRender();
 #ifdef TIMEBARS
-		tbEndTimer("PreRender");
+		tbEndTimer("PreRender");
 #endif
 
 		if(CWeather::LightningFlash && !CCullZones::CamNoRain()){
@@ -251,17 +251,17 @@ Idle(void *arg)
 		RwCameraSetFogDistance(Scene.camera, CTimeCycle::GetFogStart());
 
 #ifdef TIMEBARS
-		tbStartTimer(0, "RenderScene");
+		tbStartTimer(0, "RenderScene");
 #endif
 		RenderScene();
 #ifdef TIMEBARS
-		tbEndTimer("RenderScene");
+		tbEndTimer("RenderScene");
 #endif
 		RenderDebugShit();
 		RenderEffects();
 
-#ifdef TIMEBARS
-		tbStartTimer(0, "RenderMotionBlur");
+#ifdef TIMEBARS
+		tbStartTimer(0, "RenderMotionBlur");
 #endif
 		if((TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL) &&
 		   TheCamera.m_ScreenReductionPercentage > 0.0f)
@@ -269,11 +269,11 @@ Idle(void *arg)
 		TheCamera.RenderMotionBlur();
 #ifdef TIMEBARS
 		tbEndTimer("RenderMotionBlur");
-		tbStartTimer(0, "Render2dStuff");
+		tbStartTimer(0, "Render2dStuff");
 #endif
 		Render2dStuff();
 #ifdef TIMEBARS
-		tbEndTimer("Render2dStuff");
+		tbEndTimer("Render2dStuff");
 #endif
 	}else{
 		float viewWindow = DEFAULT_VIEWWINDOW;
@@ -293,21 +293,21 @@ Idle(void *arg)
 		DefinedState();
 #endif
 #ifdef TIMEBARS
-	tbStartTimer(0, "RenderMenus");
+	tbStartTimer(0, "RenderMenus");
 #endif
 	RenderMenus();
 #ifdef TIMEBARS
 	tbEndTimer("RenderMenus");
-	tbStartTimer(0, "DoFade");
+	tbStartTimer(0, "DoFade");
 #endif
 	DoFade();
 #ifdef TIMEBARS
 	tbEndTimer("DoFade");
-	tbStartTimer(0, "Render2dStuff-Fade");
+	tbStartTimer(0, "Render2dStuff-Fade");
 #endif
 	Render2dStuffAfterFade();
 #ifdef TIMEBARS
-	tbEndTimer("Render2dStuff-Fade");
+	tbEndTimer("Render2dStuff-Fade");
 #endif
 	CCredits::Render();
 
-- 
cgit v1.2.3