significant optimizations to the progs interpreter, changed the runaway loop counter...

[xonotic/darkplaces.git] / sbar.c

diff --git a/sbar.c b/sbar.c
index 7d1d280dbac5c5a10014a16b7e8c8438ca3ac23c..e3445d85197ee012baa7f52becf8b37703241f9f 100644 (file)
--- a/sbar.c
+++ b/sbar.c
@@ -81,6 +81,11 @@ cachepic_t *zymsb_crosshair_left1;
 cachepic_t *zymsb_crosshair_left2;
 cachepic_t *zymsb_crosshair_right;
 
+cachepic_t *sb_ranking;
+cachepic_t *sb_complete;
+cachepic_t *sb_inter;
+cachepic_t *sb_finale;
+
 cvar_t showfps = {CVAR_SAVE, "showfps", "0", "shows your rendered fps (frames per second)"};
 cvar_t showtime = {CVAR_SAVE, "showtime", "0", "shows current time of day (useful on screenshots)"};
 cvar_t showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S", "format string for time of day"};
@@ -315,6 +320,11 @@ void sbar_start(void)
                        rsb_ammo[2] = Draw_CachePic ("gfx/r_ammoplasma", true);
                }
        }
+
+       sb_ranking = Draw_CachePic ("gfx/ranking", true);
+       sb_complete = Draw_CachePic ("gfx/complete", true);
+       sb_inter = Draw_CachePic ("gfx/inter", true);
+       sb_finale = Draw_CachePic ("gfx/finale", true);
 }
 
 void sbar_shutdown(void)
@@ -916,47 +926,20 @@ void Sbar_ShowFPS(void)
        if (showfps.integer)
        {
                float calc;
-               if (showfps.integer > 1)
-               {
-                       static double currtime, frametimes[32];
-                       double newtime, total;
-                       int count, i;
-                       static int framecycle = 0;
-
-                       newtime = Sys_DoubleTime();
-                       frametimes[framecycle] = newtime - currtime;
-                       total = 0;
-                       count = 0;
-                       while(total < 0.2 && count < 32 && frametimes[i = (framecycle - count) & 31])
-                       {
-                               total += frametimes[i];
-                               count++;
-                       }
-                       framecycle++;
-                       framecycle &= 31;
-                       if (showfps.integer == 2)
-                               calc = (((double)count / total) + 0.5);
-                       else // showfps 3, rapid update
-                               calc = ((1.0 / (newtime - currtime)) + 0.5);
-                       currtime = newtime;
-               }
-               else
+               static double nexttime = 0, lasttime = 0;
+               static double framerate = 0;
+               static int framecount = 0;
+               double newtime;
+               newtime = Sys_DoubleTime();
+               if (newtime >= nexttime)
                {
-                       static double nexttime = 0, lasttime = 0;
-                       static float framerate = 0;
-                       static int framecount = 0;
-                       double newtime;
-                       newtime = Sys_DoubleTime();
-                       if (newtime >= nexttime)
-                       {
-                               framerate = ((float)framecount / (newtime - lasttime) + 0.5);
-                               lasttime = newtime;
-                               nexttime = max(nexttime + 1, lasttime - 1);
-                               framecount = 0;
-                       }
-                       framecount++;
-                       calc = framerate;
+                       framerate = framecount / (newtime - lasttime);
+                       lasttime = newtime;
+                       nexttime = max(nexttime + 0.1, lasttime - 0.1);
+                       framecount = 0;
                }
+               framecount++;
+               calc = framerate;
 
                if ((red = (calc < 1.0f)))
                        dpsnprintf(fpsstring, sizeof(fpsstring), "%4i spf", (int)(1.0f / calc + 0.5));
@@ -1402,7 +1385,6 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
 void Sbar_DeathmatchOverlay (void)
 {
        int i, x, y;
-       cachepic_t *pic;
 
        // request new ping times every two second
        if (cl.last_ping_request < realtime - 2)
@@ -1415,8 +1397,7 @@ void Sbar_DeathmatchOverlay (void)
                }
        }
 
-       pic = Draw_CachePic ("gfx/ranking", true);
-       DrawQ_Pic ((vid_conwidth.integer - pic->width)/2, 8, pic, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
+       DrawQ_Pic ((vid_conwidth.integer - sb_ranking->width)/2, 8, sb_ranking, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
 
        // scores
        Sbar_SortFrags ();
@@ -1504,13 +1485,13 @@ void Sbar_IntermissionOverlay (void)
        sbar_x = (vid_conwidth.integer - 320) >> 1;
        sbar_y = (vid_conheight.integer - 200) >> 1;
 
-       DrawQ_Pic (sbar_x + 64, sbar_y + 24, Draw_CachePic("gfx/complete", true), 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
-       DrawQ_Pic (sbar_x + 0, sbar_y + 56, Draw_CachePic("gfx/inter", true), 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
+       DrawQ_Pic (sbar_x + 64, sbar_y + 24, sb_complete, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
+       DrawQ_Pic (sbar_x + 0, sbar_y + 56, sb_inter, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
 
 // time
-       dig = (int)(cl.completed_time/60);
+       dig = (int)cl.completed_time / 60;
        Sbar_DrawNum (160, 64, dig, 3, 0);
-       num = (int)(cl.completed_time - dig*60);
+       num = (int)cl.completed_time - dig*60;
        if (gamemode != GAME_NEXUIZ)
                Sbar_DrawPic (234,64,sb_colon);
        Sbar_DrawPic (246,64,sb_nums[0][num/10]);
@@ -1537,9 +1518,6 @@ Sbar_FinaleOverlay
 */
 void Sbar_FinaleOverlay (void)
 {
-       cachepic_t      *pic;
-
-       pic = Draw_CachePic ("gfx/finale", true);
-       DrawQ_Pic((vid_conwidth.integer - pic->width)/2, 16, pic, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
+       DrawQ_Pic((vid_conwidth.integer - sb_finale->width)/2, 16, sb_finale, 0, 0, 1, 1, 1, 1 * sbar_alpha_fg.value, 0);
 }