render: merge R_View_UpdateWithScissor() and R_View_Update()

[xonotic/darkplaces.git] / r_stats.c

diff --git a/r_stats.c b/r_stats.c
index e490e263974c6f5c831725b7911b14d083e636f3..55c43e7ed8a7272a689baa23a463c6c434091e98 100644 (file)
--- a/r_stats.c
+++ b/r_stats.c
@@ -218,10 +218,10 @@ void R_TimeReport(const char *desc)
 
        if (speedstringcount + length > (vid_conwidth.integer / 8))
        {
-               strlcat(r_speeds_timestring, "\n", sizeof(r_speeds_timestring));
+               dp_strlcat(r_speeds_timestring, "\n", sizeof(r_speeds_timestring));
                speedstringcount = 0;
        }
-       strlcat(r_speeds_timestring, tempbuf, sizeof(r_speeds_timestring));
+       dp_strlcat(r_speeds_timestring, tempbuf, sizeof(r_speeds_timestring));
        speedstringcount += length;
 }
 
@@ -239,7 +239,7 @@ void R_TimeReport_BeginFrame(void)
        }
 }
 
-static int R_CountLeafTriangles(const dp_model_t *model, const mleaf_t *leaf)
+static int R_CountLeafTriangles(const model_t *model, const mleaf_t *leaf)
 {
        int i, triangles = 0;
        for (i = 0;i < leaf->numleafsurfaces;i++)