diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-29 01:32:21 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2021-01-29 17:23:02 +0100 |
| commit | d52b917c549719addf45788413210ea1700cd0d5 (patch) | |
| tree | fde2b07530985399054640435b638d00bbb4f10c /src/core | |
| parent | Update build-cmake-conan.yml (diff) | |
| download | re3-d52b917c549719addf45788413210ea1700cd0d5.tar re3-d52b917c549719addf45788413210ea1700cd0d5.tar.gz re3-d52b917c549719addf45788413210ea1700cd0d5.tar.bz2 re3-d52b917c549719addf45788413210ea1700cd0d5.tar.lz re3-d52b917c549719addf45788413210ea1700cd0d5.tar.xz re3-d52b917c549719addf45788413210ea1700cd0d5.tar.zst re3-d52b917c549719addf45788413210ea1700cd0d5.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Radar.cpp | 2 | ||||
| -rw-r--r-- | src/core/main.cpp | 5 |
2 files changed, 6 insertions, 1 deletions
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 ) { |