From d52b917c549719addf45788413210ea1700cd0d5 Mon Sep 17 00:00:00 2001
From: erorcun <erorcunerorcun@hotmail.com.tr>
Date: Fri, 29 Jan 2021 03:32:21 +0300
Subject: Some regular fixes and UB fixes

---
 src/core/Radar.cpp | 2 +-
 src/core/main.cpp  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 116e9e94..4fd7f1a5 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -908,7 +908,7 @@ int32 CRadar::GetNewUniqueBlipIndex(int32 i)
 
 uint32 CRadar::GetRadarTraceColour(uint32 color, bool bright)
 {
-	int32 c;
+	uint32 c;
 	switch (color) {
 	case RADAR_TRACE_RED:
 		if (bright)
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 66cb5635..af0d556a 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1110,8 +1110,13 @@ DisplayGameDebugText()
 #endif // #ifdef DRAW_GAME_VERSION_TEXT
 
 	FrameSamples++;
+#ifdef FIX_BUGS
+	FramesPerSecondCounter += frameTime / 1000.f; // convert to seconds
+	FramesPerSecond = FrameSamples / FramesPerSecondCounter;
+#else
 	FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f);	
 	FramesPerSecond = FramesPerSecondCounter / FrameSamples;
+#endif
 	
 	if ( FrameSamples > 30 )
 	{
-- 
cgit v1.2.3