Travis/Xonotic: use Ubuntu's mingw-w64 and fix linux32 dependency hell.

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 17ad5a7f2bf122bd45c5ee252d5452edec07bb3a..68bf62da5493fc3c1a9adb12c4d094401a1f470c 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -954,7 +954,8 @@ void R_TimeReport(const char *desc)
        t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0 + 0.5);
 
        length = dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %s", t, desc);
-       length = min(length, (int)sizeof(tempbuf) - 1);
+       if (length < 0)
+               length = (int)sizeof(tempbuf) - 1;
        if (r_speeds_longestitem < length)
                r_speeds_longestitem = length;
        for (;length < r_speeds_longestitem;length++)
@@ -1000,7 +1001,7 @@ extern cvar_t r_viewscale;
 extern float viewscalefpsadjusted;
 static void R_TimeReport_EndFrame(void)
 {
-       int i, j, lines, y;
+       int j, lines;
        cl_locnode_t *loc;
        char string[1024+4096];
        mleaf_t *viewleaf;
@@ -1064,6 +1065,7 @@ static void R_TimeReport_EndFrame(void)
 
        if (string[0])
        {
+               int i, y;
                if (string[strlen(string)-1] == '\n')
                        string[strlen(string)-1] = 0;
                lines = 1;
@@ -1095,12 +1097,13 @@ static void R_TimeReport_EndFrame(void)
        if (r_speeds_graph.integer)
        {
                // if we currently have no graph data, reset the graph data entirely
+               int i;
                if (!cls.r_speeds_graph_data)
                        for (i = 0;i < r_stat_count;i++)
                                cls.r_speeds_graph_datamin[i] = cls.r_speeds_graph_datamax[i] = 0;
                if (cls.r_speeds_graph_length != r_speeds_graph_length.integer)
                {
-                       int i, stat, index, d, graph_length, *graph_data;
+                       int stat, index, d, graph_length, *graph_data;
                        cls.r_speeds_graph_length = r_speeds_graph_length.integer;
                        cls.r_speeds_graph_current = 0;
                        if (cls.r_speeds_graph_data)
@@ -1135,7 +1138,7 @@ static void R_TimeReport_EndFrame(void)
        {
                char legend[128];
                r_vertexgeneric_t *v;
-               int numlines;
+               int i, numlines;
                const int *data;
                float x, y, width, height, scalex, scaley;
                int range_default = max(r_speeds_graph_maxdefault.integer, 1);
@@ -1776,7 +1779,7 @@ static void SCR_CaptureVideo_VideoFrame(int newframestepframenum)
 
 void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length)
 {
-       cls.capturevideo.soundsampleframe += length;
+       cls.capturevideo.soundsampleframe += (int)length;
        cls.capturevideo.soundframe(paintbuffer, length);
 }
 
@@ -1957,10 +1960,12 @@ void SHOWLMP_decodeshow(void)
                showlmp_t *oldshowlmps = cl.showlmps;
                cl.max_showlmps += 16;
                cl.showlmps = (showlmp_t *) Mem_Alloc(cls.levelmempool, cl.max_showlmps * sizeof(showlmp_t));
-               if (cl.num_showlmps)
-                       memcpy(cl.showlmps, oldshowlmps, cl.num_showlmps * sizeof(showlmp_t));
                if (oldshowlmps)
+               {
+                       if (cl.num_showlmps)
+                               memcpy(cl.showlmps, oldshowlmps, cl.num_showlmps * sizeof(showlmp_t));
                        Mem_Free(oldshowlmps);
+               }
        }
        for (k = 0;k < cl.max_showlmps;k++)
                if (cl.showlmps[k].isactive && !strcmp(cl.showlmps[k].label, lmplabel))
@@ -2073,7 +2078,7 @@ static void SCR_DrawTouchscreenOverlay(void)
        cachepic_t *pic;
        for (i = 0, a = scr_touchscreenareas;i < scr_numtouchscreenareas;i++, a++)
        {
-               if (developer.integer && vid_touchscreen_outlinealpha.value > 0 && a->rect[0] >= 0 && a->rect[1] >= 0 && a->rect[2] >= 4 && a->rect[3] >= 4)
+               if (vid_touchscreen_outlinealpha.value > 0 && a->rect[0] >= 0 && a->rect[1] >= 0 && a->rect[2] >= 4 && a->rect[3] >= 4)
                {
                        DrawQ_Fill(a->rect[0] +              2, a->rect[1]                 , a->rect[2] - 4,          1    , 1, 1, 1, vid_touchscreen_outlinealpha.value * (0.5f + 0.5f * a->active), 0);
                        DrawQ_Fill(a->rect[0] +              1, a->rect[1] +              1, a->rect[2] - 2,          1    , 1, 1, 1, vid_touchscreen_outlinealpha.value * (0.5f + 0.5f * a->active), 0);