From dfec6b101f37a370295182ae9e0ab89f69abba29 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Mon, 24 Feb 2003 04:15:18 +0000 Subject: [PATCH] don't reset SongOptions between course songs --- stepmania/src/GameState.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 50b6c63e80..f5c5074860 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -321,5 +321,10 @@ void GameState::RestoreSelectedOptions() { for( int p=0; pm_PlayerOptions[p] = GAMESTATE->m_SelectedOptions[p]; - GAMESTATE->m_SongOptions.Init(); + /* Oops. We can't do this; it'll reset lives back to 4, and we need it + * to stick around for the length of the course (for regaining). Let's + * just reset the options that can actually be set per-song. XXX */ +// GAMESTATE->m_SongOptions.Init(); + GAMESTATE->m_SongOptions.m_DrainType = SongOptions::DRAIN_NORMAL; + GAMESTATE->m_SongOptions.m_fMusicRate = 1.0f; }