add DangerAllIsOpaque metric

This commit is contained in:
Chris Danford
2003-12-07 21:40:00 +00:00
parent ade8308aa1
commit 3c2df0618d
2 changed files with 5 additions and 1 deletions
+1
View File
@@ -1934,6 +1934,7 @@ TopEdge=20
RightEdge=620 RightEdge=620
BottomEdge=460 BottomEdge=460
BlinkDangerAll=1 BlinkDangerAll=1
DangerAllIsOpaque=1
[Judgment] [Judgment]
BooOddCommand= BooOddCommand=
+4 -1
View File
@@ -36,6 +36,7 @@ const float FADE_SECONDS = 1.0f;
#define RIGHT_EDGE THEME->GetMetricI("Background","RightEdge") #define RIGHT_EDGE THEME->GetMetricI("Background","RightEdge")
#define BOTTOM_EDGE THEME->GetMetricI("Background","BottomEdge") #define BOTTOM_EDGE THEME->GetMetricI("Background","BottomEdge")
CachedThemeMetricB BLINK_DANGER_ALL("Background","BlinkDangerAll"); 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) #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() Background::Background()
{ {
BLINK_DANGER_ALL.Refresh(); BLINK_DANGER_ALL.Refresh();
DANGER_ALL_IS_OPAQUE.Refresh();
int p; int p;
@@ -503,7 +505,8 @@ void Background::DrawPrimitives()
m_pDancingCharacters->m_bDrawDangerLight = true; m_pDancingCharacters->m_bDrawDangerLight = true;
m_DangerAll.Draw(); m_DangerAll.Draw();
} }
else
if( !IsDangerAllVisible() || !DANGER_ALL_IS_OPAQUE )
{ {
if( m_pDancingCharacters ) if( m_pDancingCharacters )
m_pDancingCharacters->m_bDrawDangerLight = false; m_pDancingCharacters->m_bDrawDangerLight = false;