From: havoc Date: Tue, 6 Sep 2011 22:37:47 +0000 (+0000) Subject: fix a C++ error introduced when ddspixels was used as a memcpy target X-Git-Tag: xonotic-v0.6.0~163^2~221 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=eb3b4433e49c1ceee928c523cd296514b4544431 fix a C++ error introduced when ddspixels was used as a memcpy target git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11331 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/gl_textures.c b/gl_textures.c index 3a5b20fc..2302eef8 100644 --- a/gl_textures.c +++ b/gl_textures.c @@ -2033,7 +2033,9 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen int mip, mipwidth, mipheight, mipsize, mipsize_total; unsigned int c; GLint oldbindtexnum = 0; - const unsigned char *mippixels, *ddspixels, *mippixels_start; + const unsigned char *mippixels; + const unsigned char *mippixels_start; + unsigned char *ddspixels; unsigned char *dds; fs_offset_t ddsfilesize; unsigned int ddssize;