cl_parse: Implement 7th mode for cl_nettimesyncboundmode; jitter compensated dynamic...

[xonotic/darkplaces.git] / gl_textures.c

diff --git a/gl_textures.c b/gl_textures.c
index fcb0bac7892c57e59e318de442358cb42d4a3827..ee3d575b7ebc69a3232a5cbc1b2e256669cad28f 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -2274,7 +2274,7 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in
                return;
        }
        // update part of the texture
-       if (glt->bufferpixels || (glt->bufferpixels && (x || y || z || width != glt->inputwidth || height != glt->inputheight || depth != glt->inputdepth)))
+       if (glt->bufferpixels)
        {
                size_t j, bpp = glt->bytesperpixel;
 
@@ -2284,7 +2284,7 @@ void R_UpdateTexture(rtexture_t *rt, const unsigned char *data, int x, int y, in
                if (x < 0 || y < 0 || z < 0 || glt->tilewidth < x + width || glt->tileheight < y + height || glt->tiledepth < z + depth)
                        Host_Error("R_UpdateTexture on buffered texture with out of bounds coordinates (%i %i %i to %i %i %i is not within 0 0 0 to %i %i %i)", x, y, z, x + width, y + height, z + depth, glt->tilewidth, glt->tileheight, glt->tiledepth);
 
-               for (j = 0; j < height; j++)
+               for (j = 0; j < (size_t)height; j++)
                        memcpy(glt->bufferpixels + ((y + j) * glt->tilewidth + x) * bpp, data + j * width * bpp, width * bpp);
 
                switch(combine)