-Removed the NG Menu part, since it isnt used anymore (the old layout

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index 016a1dfb798091962310f38f8bcb95c5dae542bf..09c43cbefeabb9417fd633c8b6b2af3352c98b75 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -830,15 +830,14 @@ void Sbar_ShowFPS(void)
                        static int framerate = 0, framecount = 0;
                        double newtime;
                        newtime = Sys_DoubleTime();
-                       if (newtime < nexttime)
-                               framecount++;
-                       else
+                       if (newtime >= nexttime)
                        {
                                framerate = (int) (framecount / (newtime - lasttime) + 0.5);
                                lasttime = newtime;
-                               nexttime = lasttime + 0.2;
-                               framecount = 1;
+                               nexttime = max(nexttime + 1, lasttime - 1);
+                               framecount = 0;
                        }
+                       framecount++;
                        calc = framerate;
                }
                snprintf(fpsstring, sizeof(fpsstring), "%4i fps", calc);
@@ -886,9 +885,6 @@ Sbar_Draw
 */
 void Sbar_Draw (void)
 {
-       if (scr_con_current == vid.conheight)
-               return;         // console is full screen
-
        if (cl.intermission == 1)
        {
                Sbar_IntermissionOverlay();