]> de.git.xonotic.org Git - xonotic/darkplaces.git/commitdiff
fix two more C++ compile errors
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 30 Oct 2011 02:57:02 +0000 (02:57 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 30 Oct 2011 02:57:02 +0000 (02:57 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11490 d7cf8633-e32d-0410-b094-e92efae38249

model_alias.c

index 8d26e5b23fe91f0e61a97d2cab930a51da29a037..7a53d59e4a14051f8db336716db287824559c7f6 100644 (file)
@@ -650,7 +650,7 @@ static void Mod_MDLMD2MD3_TraceLine(dp_model_t *model, const frameblend_t *frame
        trace->realfraction = 1;
        trace->hitsupercontentsmask = hitsupercontentsmask;
        if (model->surfmesh.num_vertices > 1024)
-               vertex3f = Mem_Alloc(tempmempool, model->surfmesh.num_vertices * sizeof(float[3]));
+               vertex3f = (float *)Mem_Alloc(tempmempool, model->surfmesh.num_vertices * sizeof(float[3]));
        segmentmins[0] = min(start[0], end[0]) - 1;
        segmentmins[1] = min(start[1], end[1]) - 1;
        segmentmins[2] = min(start[2], end[2]) - 1;
@@ -690,7 +690,7 @@ static void Mod_MDLMD2MD3_TraceBox(dp_model_t *model, const frameblend_t *frameb
        trace->realfraction = 1;
        trace->hitsupercontentsmask = hitsupercontentsmask;
        if (model->surfmesh.num_vertices > 1024)
-               vertex3f = Mem_Alloc(tempmempool, model->surfmesh.num_vertices * sizeof(float[3]));
+               vertex3f = (float *)Mem_Alloc(tempmempool, model->surfmesh.num_vertices * sizeof(float[3]));
        segmentmins[0] = min(start[0], end[0]) + boxmins[0] - 1;
        segmentmins[1] = min(start[1], end[1]) + boxmins[1] - 1;
        segmentmins[2] = min(start[2], end[2]) + boxmins[2] - 1;