From: havoc Date: Mon, 9 Aug 2010 17:29:15 +0000 (+0000) Subject: fix a C++ void pointer error X-Git-Tag: xonotic-v0.1.0preview~290 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=32a222774b25c7475c57f8f3432323fbedad56e5;p=xonotic%2Fdarkplaces.git fix a C++ void pointer error git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10382 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=2900b22335e9c5ff66cdba3c21ee9f471ea311a9 --- diff --git a/model_brush.c b/model_brush.c index e2bccd88..31b94773 100644 --- a/model_brush.c +++ b/model_brush.c @@ -7382,7 +7382,7 @@ void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend) loadmodel->num_surfaces = 0; // allocate storage for the worst case number of surfaces, later we resize tempsurfaces = (msurface_t *)Mem_Alloc(loadmodel->mempool, numtextures * loadmodel->brush.numsubmodels * sizeof(msurface_t)); - submodelfirstsurface = Mem_Alloc(loadmodel->mempool, (loadmodel->brush.numsubmodels+1) * sizeof(int)); + submodelfirstsurface = (int *)Mem_Alloc(loadmodel->mempool, (loadmodel->brush.numsubmodels+1) * sizeof(int)); surface = tempsurfaces; for (submodelindex = 0;submodelindex < loadmodel->brush.numsubmodels;submodelindex++) {