diff --git a/language.version b/language.version index 3b63b7ba3..6c6b563ee 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r994 \cu(Sun 29 Oct 21:24:06 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r994 \cu(2023-10-29 21:24:06)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r995 \cu(Thu 2 Nov 16:53:10 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r995 \cu(2023-11-02 16:53:10)\c-"; diff --git a/zscript/hud/swwm_hud_topstuff.zsc b/zscript/hud/swwm_hud_topstuff.zsc index b14c47d7c..72aff1b2c 100644 --- a/zscript/hud/swwm_hud_topstuff.zsc +++ b/zscript/hud/swwm_hud_topstuff.zsc @@ -395,9 +395,7 @@ extend Class SWWMStatusBar { int secwit = CheckSecret(l); int lock = SWWMUtility.GetLineLock(l); - if ( secwit == 1 ) col = mm_secretsectorcolor; - else if ( secwit == 2 ) col = mm_unexploredsecretcolor; - else if ( l.flags&Line.ML_SECRET ) + if ( (l.flags&Line.ML_SECRET) && !level.allmap ) // allmap will reveal these { if ( am_cheat && l.backsector && mm_secretwallcolor ) col = mm_secretwallcolor; @@ -445,6 +443,8 @@ extend Class SWWMStatusBar } else if ( mm_specialwallcolor && ShowTriggerLine(l) ) col = mm_specialwallcolor; + else if ( secwit == 1 ) col = mm_secretsectorcolor; // locked doors and trigger lines take priority over secrets + else if ( secwit == 2 ) col = mm_unexploredsecretcolor; else if ( l.frontsector && l.backsector ) { if ( !CmpFloorPlanes(l) ) col = mm_fdwallcolor;