real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

restored fminf

Browse Source 
This was SVN commit r384.
This commit is contained in:
janwas 2004-06-03 13:35:39 +00:00
parent 9a9c0055dc
commit d9b1daf2e4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/lib/timer.cpp
View File

@ -19,6 +19,7 @@
#include "lib.h"
#include "timer.h"
#include "sysdep/sysdep.h"
#ifdef _WIN32
#include "sysdep/win/hrt.h"
@ -155,7 +156,7 @@ void calc_fps()
// update fps counter if update threshold is exceeded
const float avg_fps = fps_sum / H;
const float d_avg = avg_fps-fps;
const float max_diff = __min( 5.f, 0.05f * fps ); //fminf(5.f, 0.05f*fps);
const float max_diff = fminf(5.f, 0.05f*fps);
if((trend > 0 && (avg_fps > fps || d_avg < -4.f)) || // going up, or large drop
(trend < 0 && (avg_fps < fps || d_avg > 4.f)) || // going down, or large raise