]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
some typecasts for g++
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 11 Mar 2009 14:09:38 +0000 (14:09 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 11 Mar 2009 14:09:38 +0000 (14:09 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8798 d7cf8633-e32d-0410-b094-e92efae38249

model_shared.c

index 6d16dc964efab1acc49ecb32fcf6de0a03b27263..9d5acedbbdb2a7920237acd4f6726f150af0d2f5 100644 (file)
@@ -2227,10 +2227,10 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
        size_t l;
        size_t outbufferpos = 0;
        size_t outbuffermax = 0x100000;
-       char *outbuffer = Z_Malloc(outbuffermax), *oldbuffer;
+       char *outbuffer = (char *) Z_Malloc(outbuffermax), *oldbuffer;
        const msurface_t *surface;
        const int maxtextures = 256;
-       char *texturenames = Z_Malloc(maxtextures * MAX_QPATH);
+       char *texturenames = (char *) Z_Malloc(maxtextures * MAX_QPATH);
 
        // construct the mtllib file
        l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "# mtllib for %s exported by darkplaces engine\n", originalfilename);
@@ -2254,7 +2254,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                {
                        outbuffermax *= 2;
                        oldbuffer = outbuffer;
-                       outbuffer = Z_Malloc(outbuffermax);
+                       outbuffer = (char *) Z_Malloc(outbuffermax);
                        memcpy(outbuffer, oldbuffer, outbufferpos);
                        Z_Free(oldbuffer);
                }
@@ -2277,7 +2277,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                {
                        outbuffermax *= 2;
                        oldbuffer = outbuffer;
-                       outbuffer = Z_Malloc(outbuffermax);
+                       outbuffer = (char *) Z_Malloc(outbuffermax);
                        memcpy(outbuffer, oldbuffer, outbufferpos);
                        Z_Free(oldbuffer);
                }
@@ -2296,7 +2296,7 @@ static void Mod_Decompile_OBJ(dp_model_t *model, const char *filename, const cha
                        {
                                outbuffermax *= 2;
                                oldbuffer = outbuffer;
-                               outbuffer = Z_Malloc(outbuffermax);
+                               outbuffer = (char *) Z_Malloc(outbuffermax);
                                memcpy(outbuffer, oldbuffer, outbufferpos);
                                Z_Free(oldbuffer);
                        }
@@ -2334,7 +2334,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
        size_t l;
        size_t outbufferpos = 0;
        size_t outbuffermax = 0x100000;
-       char *outbuffer = Z_Malloc(outbuffermax), *oldbuffer;
+       char *outbuffer = (char *) Z_Malloc(outbuffermax), *oldbuffer;
        const msurface_t *surface;
        l = dpsnprintf(outbuffer + outbufferpos, outbuffermax - outbufferpos, "version 1\nnodes\n");
        if (l > 0)
@@ -2355,7 +2355,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                {
                        outbuffermax *= 2;
                        oldbuffer = outbuffer;
-                       outbuffer = Z_Malloc(outbuffermax);
+                       outbuffer = (char *) Z_Malloc(outbuffermax);
                        memcpy(outbuffer, oldbuffer, outbufferpos);
                        Z_Free(oldbuffer);
                }
@@ -2382,7 +2382,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                        {
                                outbuffermax *= 2;
                                oldbuffer = outbuffer;
-                               outbuffer = Z_Malloc(outbuffermax);
+                               outbuffer = (char *) Z_Malloc(outbuffermax);
                                memcpy(outbuffer, oldbuffer, outbufferpos);
                                Z_Free(oldbuffer);
                        }
@@ -2458,7 +2458,7 @@ static void Mod_Decompile_SMD(dp_model_t *model, const char *filename, int first
                                {
                                        outbuffermax *= 2;
                                        oldbuffer = outbuffer;
-                                       outbuffer = Z_Malloc(outbuffermax);
+                                       outbuffer = (char *) Z_Malloc(outbuffermax);
                                        memcpy(outbuffer, oldbuffer, outbufferpos);
                                        Z_Free(oldbuffer);
                                }