made darkplaces able to compile as C++ again, and fixed all conversion warnings when...

[xonotic/darkplaces.git] / model_shared.c

diff --git a/model_shared.c b/model_shared.c
index 841346b4dd37253794e919c782269a6b16b9d579..92f7ea5117bb73c6c2088777303d9d84fd755bcd 100644 (file)
--- a/model_shared.c
+++ b/model_shared.c
@@ -1044,7 +1044,7 @@ int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, const char *basename, int
                                        break;
                        if (i < width * height * 4)
                        {
-                               unsigned char *fogpixels = Mem_Alloc(loadmodel->mempool, width * height * 4);
+                               unsigned char *fogpixels = (unsigned char *)Mem_Alloc(loadmodel->mempool, width * height * 4);
                                memcpy(fogpixels, skindata, width * height * 4);
                                for (i = 0;i < width * height * 4;i += 4)
                                        fogpixels[i] = fogpixels[i+1] = fogpixels[i+2] = 255;