Merge branch 'sprinfo-bruh-moment' into 'master'
Freed before read, oops! See merge request STJr/SRB2Internal!470
This commit is contained in:
commit
144502729a
|
@ -1066,16 +1066,15 @@ void R_ParseSPRTINFOLump(UINT16 wadNum, UINT16 lumpNum)
|
||||||
sprinfoToken = M_GetToken(sprinfoText);
|
sprinfoToken = M_GetToken(sprinfoText);
|
||||||
while (sprinfoToken != NULL)
|
while (sprinfoToken != NULL)
|
||||||
{
|
{
|
||||||
if (!stricmp(sprinfoToken, "SPRITE") || !stricmp(sprinfoToken, "SPRITE2"))
|
if (!stricmp(sprinfoToken, "SPRITE"))
|
||||||
{
|
R_ParseSpriteInfo(false);
|
||||||
Z_Free(sprinfoToken);
|
else if (!stricmp(sprinfoToken, "SPRITE2"))
|
||||||
R_ParseSpriteInfo(!stricmp(sprinfoToken, "SPRITE2"));
|
R_ParseSpriteInfo(true);
|
||||||
}
|
|
||||||
else
|
else
|
||||||
I_Error("Error parsing SPRTINFO lump: Unknown keyword \"%s\"", sprinfoToken);
|
I_Error("Error parsing SPRTINFO lump: Unknown keyword \"%s\"", sprinfoToken);
|
||||||
|
Z_Free(sprinfoToken);
|
||||||
sprinfoToken = M_GetToken(NULL);
|
sprinfoToken = M_GetToken(NULL);
|
||||||
}
|
}
|
||||||
Z_Free(sprinfoToken);
|
|
||||||
Z_Free((void *)sprinfoText);
|
Z_Free((void *)sprinfoText);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue