try harder to get a version string out of git

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index bedbc92f8805294de05e79fe4dcc6e976a39156a..60cae502929ddbb7353cb813df57067f7e0e9617 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -613,9 +613,9 @@ static int SCR_InfobarHeight(void)
        if (cl.time > cl.oldtime)
                scr_infobartime_off -= cl.time - cl.oldtime;
        if(scr_infobartime_off > 0)
-               offset += 8;
+               offset += 1;
        if(cls.qw_downloadname[0])
-               offset += 8;
+               offset += 1;
 
        downinfo = Curl_GetDownloadInfo(&nDownloads, &addinfo);
        if(downinfo)
@@ -735,8 +735,8 @@ void R_TimeReport(const char *desc)
                return;
 
        CHECKGLERROR
-       if (r_speeds.integer == 2 && qglFinish)
-               qglFinish();
+       if (r_speeds.integer == 2)
+               GL_Finish();
        CHECKGLERROR
        r_timereport_temp = r_timereport_current;
        r_timereport_current = Sys_DoubleTime();
@@ -2335,8 +2335,8 @@ void CL_UpdateScreen(void)
                }
        }
 
-       if (r_viewscale_fpsscaling.integer && qglFinish)
-               qglFinish();
+       if (r_viewscale_fpsscaling.integer)
+               GL_Finish();
        drawscreenstart = Sys_DoubleTime();
        if (R_Stereo_Active())
        {
@@ -2370,8 +2370,8 @@ void CL_UpdateScreen(void)
        }
        else
                SCR_DrawScreen();
-       if (r_viewscale_fpsscaling.integer && qglFinish)
-               qglFinish();
+       if (r_viewscale_fpsscaling.integer)
+               GL_Finish();
        r_refdef.lastdrawscreentime = Sys_DoubleTime() - drawscreenstart;
 
        SCR_CaptureVideo();