From 2f8deb615f14a4abc9ea6b7d88a85725ac860662 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 21 Dec 2004 01:29:41 +0000 Subject: [PATCH] fix ScreenCaution not continuing when menu timer is disabled --- stepmania/Themes/default/metrics.ini | 2 ++ stepmania/src/ScreenWithMenuElements.cpp | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index b33bf3148f..d827fc6f25 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -108,6 +108,7 @@ StyleIcon=0 MemoryCardIcons=0 TimerSeconds=5 TimerStealth=1 +ForceTimer=1 TimerX= TimerY= TimerOnCommand=hidden,1 @@ -2403,6 +2404,7 @@ TimerY=SCREEN_TOP+22 TimerOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH TimerOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; TimerStealth=0 +ForceTimer=0 [MenuTimer] WarningStart=6 diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 0cf10fb93b..80582922b5 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -13,6 +13,7 @@ #define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth") #define STYLE_ICON THEME->GetMetricB(m_sName,"StyleIcon") #define MEMORY_CARD_ICONS THEME->GetMetricB(m_sName,"MemoryCardIcons") +#define FORCE_TIMER THEME->GetMetricB(m_sName,"ForceTimer") //REGISTER_SCREEN_CLASS( ScreenWithMenuElements ); ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( sClassName ) @@ -110,7 +111,7 @@ ScreenWithMenuElements::~ScreenWithMenuElements() void ScreenWithMenuElements::ResetTimer() { - if( TIMER_SECONDS > 0.0f && PREFSMAN->m_bMenuTimer && !GAMESTATE->m_bEditing ) + if( TIMER_SECONDS > 0.0f && (PREFSMAN->m_bMenuTimer || FORCE_TIMER) && !GAMESTATE->m_bEditing ) { m_MenuTimer->SetSeconds( TIMER_SECONDS ); m_MenuTimer->Start();