From 93bd404072d9068ccb77891ffa3e10059cac4b74 Mon Sep 17 00:00:00 2001 From: James R Date: Thu, 17 Mar 2022 12:15:08 -0700 Subject: [PATCH] Incorporate few more instances of Z_Free NULL no-op --- src/k_boss.c | 6 ++---- src/p_setup.c | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/k_boss.c b/src/k_boss.c index 0c1217fc4..490adb27e 100644 --- a/src/k_boss.c +++ b/src/k_boss.c @@ -110,15 +110,13 @@ void K_InitBossHealthBar(const char *enemyname, const char *subtitle, sfxenum_t { if (enemyname && enemyname[0]) { - if (bossinfo.enemyname) - Z_Free(bossinfo.enemyname); + Z_Free(bossinfo.enemyname); bossinfo.enemyname = Z_StrDup(enemyname); } if (subtitle && subtitle[0]) { - if (bossinfo.subtitle) - Z_Free(bossinfo.subtitle); + Z_Free(bossinfo.subtitle); bossinfo.subtitle = Z_StrDup(subtitle); } diff --git a/src/p_setup.c b/src/p_setup.c index dd0c181b5..7ff335512 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4301,10 +4301,8 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) // Reset some pesky boss state that can't be handled elsewhere. bossinfo.barlen = BOSSHEALTHBARLEN; bossinfo.visualbar = 0; - if (bossinfo.enemyname) - Z_Free(bossinfo.enemyname); - if (bossinfo.subtitle) - Z_Free(bossinfo.subtitle); + Z_Free(bossinfo.enemyname); + Z_Free(bossinfo.subtitle); bossinfo.enemyname = bossinfo.subtitle = NULL; bossinfo.titleshow = 0; bossinfo.titlesound = sfx_typri1;