From 69784312bff77bc4f5cee0a14dc244e69309b302 Mon Sep 17 00:00:00 2001 From: Brad Harding Date: Wed, 27 Nov 2024 16:33:40 +1100 Subject: [PATCH] Minor tweaks --- releasenotes.md | 1 + src/hu_stuff.c | 1 - src/wi_stuff.c | 14 +++++++------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/releasenotes.md b/releasenotes.md index 87d1ed06b..ee9e40758 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -7,6 +7,7 @@ * Several changes have been made to further improve the overall performance and stability of *DOOM Retro*. * Minor changes have been made to text that is output to the console. * Minor improvements have been made to text autocompleted in the console by pressing the TAB key. +* A bug is fixed whereby textures wouldn’t load from a PWAD in some rare instances. * These changes have been made when a PWAD is loaded that has a custom character set: * The message displayed when the player finds a secret is now gold if the `secretmessages` CVAR is `on`. * The message displayed when using the `IDCLEV` cheat or `map` CCMD to warp to a secret map is now gold. diff --git a/src/hu_stuff.c b/src/hu_stuff.c index bf060802b..23817bb56 100644 --- a/src/hu_stuff.c +++ b/src/hu_stuff.c @@ -1542,7 +1542,6 @@ void HU_Drawer(void) if (automapactive) { - if (r_althud && r_screensize == r_screensize_max) HUlib_DrawAltAutomapTextLine(&w_title, false); else diff --git a/src/wi_stuff.c b/src/wi_stuff.c index 2bdb1424f..21fff4341 100644 --- a/src/wi_stuff.c +++ b/src/wi_stuff.c @@ -329,31 +329,31 @@ static bool CheckConditions(interlevelcond_t *conditions, bool enteringcondition switch (condition->condition) { case AnimCondition_MapNumGreater: - conditionsmet = (map > condition->param); + conditionsmet &= (map > condition->param); break; case AnimCondition_MapNumEqual: - conditionsmet = (map == condition->param); + conditionsmet &= (map == condition->param); break; case AnimCondition_MapVisited: - conditionsmet = (map > condition->param); + conditionsmet &= (map > condition->param); break; case AnimCondition_MapNotSecret: - conditionsmet = !P_IsSecret(1, map); + conditionsmet &= !P_IsSecret(1, map); break; case AnimCondition_SecretVisited: - conditionsmet = wbs->didsecret; + conditionsmet &= wbs->didsecret; break; case AnimCondition_Tally: - conditionsmet = !enteringcondition; + conditionsmet &= !enteringcondition; break; case AnimCondition_IsEntering: - conditionsmet = enteringcondition; + conditionsmet &= enteringcondition; break; default: