thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Incorporate few more instances of Z_Free NULL no-op

Browse source
This commit is contained in:
James R 2022-03-17 12:15:08 -07:00
parent 1ac2730ced
commit 93bd404072
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_boss.c
View file

@ -110,15 +110,13 @@ void K_InitBossHealthBar(const char *enemyname, const char *subtitle, sfxenum_t
{ {
if (enemyname && enemyname[0]) if (enemyname && enemyname[0])
{ {
if (bossinfo.enemyname) Z_Free(bossinfo.enemyname);
Z_Free(bossinfo.enemyname);
bossinfo.enemyname = Z_StrDup(enemyname); bossinfo.enemyname = Z_StrDup(enemyname);
} }
if (subtitle && subtitle[0]) if (subtitle && subtitle[0])
{ {
if (bossinfo.subtitle) Z_Free(bossinfo.subtitle);
Z_Free(bossinfo.subtitle);
bossinfo.subtitle = Z_StrDup(subtitle); bossinfo.subtitle = Z_StrDup(subtitle);
} }

6
src/p_setup.c
View file

@ -4301,10 +4301,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate)
// Reset some pesky boss state that can't be handled elsewhere. // Reset some pesky boss state that can't be handled elsewhere.
bossinfo.barlen = BOSSHEALTHBARLEN; bossinfo.barlen = BOSSHEALTHBARLEN;
bossinfo.visualbar = 0; bossinfo.visualbar = 0;
if (bossinfo.enemyname) Z_Free(bossinfo.enemyname);
Z_Free(bossinfo.enemyname); Z_Free(bossinfo.subtitle);
if (bossinfo.subtitle)
Z_Free(bossinfo.subtitle);
bossinfo.enemyname = bossinfo.subtitle = NULL; bossinfo.enemyname = bossinfo.subtitle = NULL;
bossinfo.titleshow = 0; bossinfo.titleshow = 0;
bossinfo.titlesound = sfx_typri1; bossinfo.titlesound = sfx_typri1;