phase/inventory: fix health bar behavior

Regression since converting inventory to a phase
lahm86 · Mar 24, 2024 · df7ab2e · df7ab2e
1 parent 61c0674
commit df7ab2e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/game/inventory/inventory_ring.c b/src/game/inventory/inventory_ring.c
@@ -240,7 +240,6 @@ void Inv_Ring_Active(INVENTORY_ITEM *inv_item)
 
     case O_MEDI_OPTION:
         Overlay_BarSetHealthTimer(40);
-        Overlay_BarDrawHealth();
         if (!g_InvItemText[IT_QTY] && qty > 1) {
             sprintf(temp_text, "%d", qty);
             Overlay_MakeAmmoString(temp_text);
@@ -252,7 +251,6 @@ void Inv_Ring_Active(INVENTORY_ITEM *inv_item)
 
     case O_BIGMEDI_OPTION:
         Overlay_BarSetHealthTimer(40);
-        Overlay_BarDrawHealth();
         if (!g_InvItemText[IT_QTY] && qty > 1) {
             sprintf(temp_text, "%d", qty);
             Overlay_MakeAmmoString(temp_text);

diff --git a/src/game/phase/phase_inventory.c b/src/game/phase/phase_inventory.c
@@ -12,6 +12,7 @@
 #include "game/music.h"
 #include "game/option.h"
 #include "game/output.h"
+#include "game/overlay.h"
 #include "game/savegame.h"
 #include "game/screen.h"
 #include "game/shell.h"
@@ -111,6 +112,17 @@ static void Inv_Draw(RING_INFO *ring, IMOTION_INFO *motion)
         }
     }
 
+    INVENTORY_ITEM *inv_item = ring->list[ring->current_object];
+    switch (inv_item->object_number) {
+    case O_MEDI_OPTION:
+    case O_BIGMEDI_OPTION:
+        Overlay_BarDrawHealth();
+        break;
+
+    default:
+        break;
+    }
+
     Matrix_Pop();
     Viewport_SetFOV(old_fov);
 }