zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-05-30 08:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added Xfree() function to accompany the Xmalloc() family of functions and change all uses of Bfree() to Xfree()

Browse source 
This was necessary because everything is already allocated with the Xmalloc() functions, but a future commit will make blocks allocated with those functions no longer compatible with the system implementation of free(), which Bfree() wraps.

git-svn-id: https://svn.eduke32.com/eduke32@7705 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/build.cpp
#	source/build/src/mdsprite.cpp
#	source/build/src/polymer.cpp
#	source/build/src/polymost.cpp
#	source/build/src/texcache.cpp
#	source/build/src/voxmodel.cpp
This commit is contained in:
terminx 2019-06-25 11:29:08 +00:00 • committed by Christoph Oelckers
parent dc62b986e8
commit ccdba037b5
47 changed files with 343 additions and 338 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/build/src/voxmodel.cpp
View file

@ -76,7 +76,7 @@ FHardwareTexture *gloadtex(const int32_t *picbuf, int32_t xsiz, int32_t ysiz, in
tex->CreateTexture(xsiz, ysiz, false, false);
tex->LoadTexture((uint8_t*)pic2); // RGBA
tex->SetSampler(SamplerNoFilter);
Bfree(pic2);
Xfree(pic2);
return tex;
}
@ -534,7 +534,7 @@ skindidntfit:
i--;
if (i < 0) //Time-out! Very slow if this happens... but at least it still works :P
{
Bfree(zbit);
Xfree(zbit);
//Re-generate shp[].x/y (box sizes) from shcnt (now head indices) for next pass :/
j = 0;
@ -578,7 +578,7 @@ skindidntfit:
}
}
Bfree(shp); Bfree(zbit); Bfree(bx0);
Xfree(shp); Xfree(zbit); Xfree(bx0);
return gvox;
}
@ -681,7 +681,7 @@ static int32_t loadvox(const char *filnam)
}
}
Bfree(tbuf);
Xfree(tbuf);
kclose(fil);
return 0;
@ -766,8 +766,8 @@ static int32_t loadkvx(const char *filnam)
}
}
Bfree(tbuf);
Bfree(xyoffs);
Xfree(tbuf);
Xfree(xyoffs);
return 0;
}
@ -840,7 +840,7 @@ static int32_t loadkv6(const char *filnam)
}
}
Bfree(ylen);
Xfree(ylen);
kclose(fil);
return 0;
@ -855,7 +855,7 @@ void voxfree(voxmodel_t *m)
DO_FREE_AND_NULL(m->quad);
DO_FREE_AND_NULL(m->texid);
Bfree(m);
Xfree(m);
}
voxmodel_t *voxload(const char *filnam)