actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix ScreenCaution not continuing when menu timer is disabled

Browse Source
This commit is contained in:
Glenn Maynard
2004-12-21 01:29:41 +00:00
parent 6213e4771f
commit 2f8deb615f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+2
View File
@@ -108,6 +108,7 @@ StyleIcon=0
MemoryCardIcons=0 MemoryCardIcons=0
TimerSeconds=5 TimerSeconds=5
TimerStealth=1 TimerStealth=1
ForceTimer=1
TimerX= TimerX=
TimerY= TimerY=
TimerOnCommand=hidden,1 TimerOnCommand=hidden,1
@@ -2403,6 +2404,7 @@ TimerY=SCREEN_TOP+22
TimerOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH TimerOnCommand=draworder,97;addx,SCREEN_WIDTH;spring,0.5;addx,-SCREEN_WIDTH
TimerOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH; TimerOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH;
TimerStealth=0 TimerStealth=0
ForceTimer=0
[MenuTimer] [MenuTimer]
WarningStart=6 WarningStart=6
stepmania/src/ScreenWithMenuElements.cpp
+2 -1
View File
@@ -13,6 +13,7 @@
#define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth") #define TIMER_STEALTH THEME->GetMetricB(m_sName,"TimerStealth")
#define STYLE_ICON THEME->GetMetricB(m_sName,"StyleIcon") #define STYLE_ICON THEME->GetMetricB(m_sName,"StyleIcon")
#define MEMORY_CARD_ICONS THEME->GetMetricB(m_sName,"MemoryCardIcons") #define MEMORY_CARD_ICONS THEME->GetMetricB(m_sName,"MemoryCardIcons")
#define FORCE_TIMER THEME->GetMetricB(m_sName,"ForceTimer")
//REGISTER_SCREEN_CLASS( ScreenWithMenuElements ); //REGISTER_SCREEN_CLASS( ScreenWithMenuElements );
ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( sClassName ) ScreenWithMenuElements::ScreenWithMenuElements( CString sClassName ) : Screen( sClassName )
@@ -110,7 +111,7 @@ ScreenWithMenuElements::~ScreenWithMenuElements()
void ScreenWithMenuElements::ResetTimer() 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->SetSeconds( TIMER_SECONDS );
m_MenuTimer->Start(); m_MenuTimer->Start();