Minor tweaks

bradharding · Nov 27, 2024 · 6978431 · 6978431
1 parent 9d78e8d
commit 6978431
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git 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 <kbd><b>TAB</b></kbd> 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
@@ -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
@@ -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: