From 3c2df0618dc2ab8372a6d78dd88cebecf2858dbf Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 7 Dec 2003 21:40:00 +0000 Subject: [PATCH] add DangerAllIsOpaque metric --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/Background.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 560b3ce385..dcba0b123c 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1934,6 +1934,7 @@ TopEdge=20 RightEdge=620 BottomEdge=460 BlinkDangerAll=1 +DangerAllIsOpaque=1 [Judgment] BooOddCommand= diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp index 5f06528b3a..b5abc32e78 100644 --- a/stepmania/src/Background.cpp +++ b/stepmania/src/Background.cpp @@ -36,6 +36,7 @@ const float FADE_SECONDS = 1.0f; #define RIGHT_EDGE THEME->GetMetricI("Background","RightEdge") #define BOTTOM_EDGE THEME->GetMetricI("Background","BottomEdge") CachedThemeMetricB BLINK_DANGER_ALL("Background","BlinkDangerAll"); +CachedThemeMetricB DANGER_ALL_IS_OPAQUE("Background","DangerAllIsOpaque"); #define RECT_BACKGROUND RectI(LEFT_EDGE,TOP_EDGE,RIGHT_EDGE,BOTTOM_EDGE) @@ -47,6 +48,7 @@ CString RandomBackground(int num) { return ssprintf("__random%i", num); } Background::Background() { BLINK_DANGER_ALL.Refresh(); + DANGER_ALL_IS_OPAQUE.Refresh(); int p; @@ -503,7 +505,8 @@ void Background::DrawPrimitives() m_pDancingCharacters->m_bDrawDangerLight = true; m_DangerAll.Draw(); } - else + + if( !IsDangerAllVisible() || !DANGER_ALL_IS_OPAQUE ) { if( m_pDancingCharacters ) m_pDancingCharacters->m_bDrawDangerLight = false;