0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-04-18 00:11:48 +00:00

Merge branch 'master' into next

This commit is contained in:
Monster Iestyn 2019-06-21 22:10:32 +01:00
commit f84c898040

View file

@ -334,7 +334,6 @@ static restype_t ResourceFileDetect (const char* filename)
static lumpinfo_t* ResGetLumpsStandalone (FILE* handle, UINT16* numlumps, const char* lumpname)
{
lumpinfo_t* lumpinfo = Z_Calloc(sizeof (*lumpinfo), PU_STATIC, NULL);
lumpinfo = Z_Calloc(sizeof (*lumpinfo), PU_STATIC, NULL);
lumpinfo->position = 0;
fseek(handle, 0, SEEK_END);
lumpinfo->size = ftell(handle);