From 06fbfab58641fa1cfdc2f383b0a8d7963fe6da5f Mon Sep 17 00:00:00 2001 From: walkawayy <81546780+walkawayy@users.noreply.github.com> Date: Tue, 14 May 2024 10:06:49 -0400 Subject: [PATCH] overlay: fix FPS counter overlapping the healthbar in demos (#1372) Resolves #1369. --- CHANGELOG.md | 1 + src/game/overlay.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38d23034c..73d282479 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - fixed config tool and installer missing icons (#1358, regression from 4.0) - fixed looking forward too far causing an upside down camera frame (#1338) - fixed the enemy bear behavior in demo mode (#1370, regression since 2.16) +- fixed the FPS counter overlapping the healthbar in demo mode (#1369) ## [4.1.2](https://github.com/LostArtefacts/TR1X/compare/4.1.1...4.1.2) - 2024-04-28 - fixed pictures display time (#1349, regression from 4.1) diff --git a/src/game/overlay.c b/src/game/overlay.c index ef3db7601..e0ea9e3d0 100644 --- a/src/game/overlay.c +++ b/src/game/overlay.c @@ -749,7 +749,8 @@ void Overlay_DrawFPSInfo(void) bool inv_health_showable = Phase_Get() == PHASE_INVENTORY && g_GameInfo.inv_showing_medpack && m_HealthBar.location == BL_TOP_LEFT; - bool game_bar_showable = Phase_Get() == PHASE_GAME + bool game_bar_showable = + (Phase_Get() == PHASE_GAME || Phase_Get() == PHASE_DEMO) && (m_HealthBar.location == BL_TOP_LEFT || m_AirBar.location == BL_TOP_LEFT || m_EnemyBar.location == BL_TOP_LEFT);