From 5bbf173b4ec1563b7a93ea75ad1564d64907a130 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 4 May 2017 11:37:36 +0200 Subject: [PATCH] - fixed: SBARINFO based status bars got the wrong color for automap HUD highlights when playing Doom. --- wadsrc/static/zscript/statusbar/doom_sbar.txt | 6 ------ wadsrc/static/zscript/statusbar/statusbar.txt | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/wadsrc/static/zscript/statusbar/doom_sbar.txt b/wadsrc/static/zscript/statusbar/doom_sbar.txt index 00471540b..7eddf319e 100644 --- a/wadsrc/static/zscript/statusbar/doom_sbar.txt +++ b/wadsrc/static/zscript/statusbar/doom_sbar.txt @@ -20,12 +20,6 @@ class DoomStatusBar : BaseStatusBar diparms = InventoryBarState.Create(); } - override void DrawAutomapHUD(double ticFrac) - { - // This uses the normal automap HUD but just changes the highlight color. - DoDrawAutomapHUD(Font.CR_GREY, Font.CR_UNTRANSLATED); - } - override void Draw (int state, double TicFrac) { Super.Draw (state, TicFrac); diff --git a/wadsrc/static/zscript/statusbar/statusbar.txt b/wadsrc/static/zscript/statusbar/statusbar.txt index b1aa96f31..cc773e1a2 100644 --- a/wadsrc/static/zscript/statusbar/statusbar.txt +++ b/wadsrc/static/zscript/statusbar/statusbar.txt @@ -798,7 +798,8 @@ class BaseStatusBar native ui virtual void DrawAutomapHUD(double ticFrac) { - DoDrawAutomapHUD(Font.CR_GREY, Font.CR_YELLOW); + // game needs to be checked here, so that SBARINFO also gets the correct colors. + DoDrawAutomapHUD(Font.CR_GREY, gameinfo.gametype & GAME_DoomChex? Font.CR_UNTRANSLATED : Font.CR_YELLOW); } //---------------------------------------------------------------------------