From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 25 Dec 2010 16:55:15 +0000 (+0000)
Subject: fix a C++ error
X-Git-Tag: xonotic-v0.5.0~438^2~160
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d69b47180eac5d4e158bc9a3c7dbc13547eb8de2;p=xonotic%2Fdarkplaces.git

fix a C++ error

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10681 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/gl_textures.c b/gl_textures.c
index 18f6af85..e263502a 100644
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -2003,7 +2003,7 @@ rtexture_t *R_LoadTextureDDSFile(rtexturepool_t *rtexturepool, const char *filen
 	if(force_swdecode)
 	{
 		int mipsize_new = mipsize_total / bytesperblock * 4;
-		unsigned char *mipnewpixels = Mem_Alloc(tempmempool, mipsize_new);
+		unsigned char *mipnewpixels = (unsigned char *) Mem_Alloc(tempmempool, mipsize_new);
 		unsigned char *p = mipnewpixels;
 		for (i = bytesperblock == 16 ? 8 : 0;i < (int)mipsize_total;i += bytesperblock, p += 4)
 		{