From 98759232786b524549bdc78b780667fbe3106436 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Wed, 25 Aug 2004 08:56:58 +0000 Subject: [PATCH] Force FailImmediate in battery mode. Some code assumes it. Are there any interesting uses of allowing non-FailImmediate in battery mode? It would be harmless to allow setting it in the song options screen if it was useful and worked (the current problem is that the default fail mode is being applied, too). --- stepmania/src/ScreenGameplay.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index e638fac497..3d8c59b6fe 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -885,6 +885,11 @@ void ScreenGameplay::LoadNextSong() // Restore the player's originally selected options. GAMESTATE->RestoreSelectedOptions(); + /* If we're in battery mode, force FailImmediate. We assume in PlayerMinus::Step that + * failed players can't step. */ + if( GAMESTATE->m_SongOptions.m_LifeType == SongOptions::LIFE_BATTERY ) + GAMESTATE->m_SongOptions.m_FailType = SongOptions::FAIL_IMMEDIATE; + m_textSongOptions.SetText( GAMESTATE->m_SongOptions.GetString() );