From 2c44139bb7e15752635853e7347fe42f8072ff01 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 25 Oct 2003 07:25:24 +0000 Subject: [PATCH] fix changing to life bar from song opts menu in Oni mode --- stepmania/src/ModeChoice.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ModeChoice.cpp b/stepmania/src/ModeChoice.cpp index aea1460207..6d6efbe2ee 100644 --- a/stepmania/src/ModeChoice.cpp +++ b/stepmania/src/ModeChoice.cpp @@ -226,6 +226,7 @@ void ModeChoice::ApplyToAllPlayers() const void ModeChoice::Apply( PlayerNumber pn ) const { + const PlayMode OldPlayMode = GAMESTATE->m_PlayMode; if( m_game != GAME_INVALID ) GAMESTATE->m_CurGame = m_game; if( m_pm != PLAY_MODE_INVALID ) @@ -241,7 +242,7 @@ void ModeChoice::Apply( PlayerNumber pn ) const // HACK: Set life type to BATTERY just once here so it happens once and // we don't override the user's changes if they back out. - if( GAMESTATE->m_PlayMode == PLAY_MODE_ONI ) + if( GAMESTATE->m_PlayMode == PLAY_MODE_ONI && GAMESTATE->m_PlayMode != OldPlayMode ) GAMESTATE->m_SongOptions.m_LifeType = SongOptions::LIFE_BATTERY;