From 2251b989d4d19d4849c5fc99b7cfa4ad5db81cec Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 12 Jul 2003 20:09:31 +0000 Subject: [PATCH] Make the reset code go back to defaults, not null options. --- stepmania/src/CodeDetector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/src/CodeDetector.cpp b/stepmania/src/CodeDetector.cpp index ee921802a2..cc17b4aea2 100644 --- a/stepmania/src/CodeDetector.cpp +++ b/stepmania/src/CodeDetector.cpp @@ -19,6 +19,7 @@ #include "GameDef.h" #include "StyleDef.h" #include "RageUtil.h" +#include "PrefsManager.h" const CString g_sCodeNames[CodeDetector::NUM_CODES] = { "Easier1", @@ -170,7 +171,8 @@ bool CodeDetector::DetectAndAdjustMusicOptions( GameController controller ) case CODE_REVERSE: FLOAT_TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_fReverseScroll ); break; case CODE_HOLDS: TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_bHoldNotes, true, false ); break; case CODE_DARK: FLOAT_TOGGLE( GAMESTATE->m_PlayerOptions[pn].m_fDark ); break; - case CODE_CANCEL_ALL: GAMESTATE->m_PlayerOptions[pn].Init(); break; + case CODE_CANCEL_ALL: GAMESTATE->m_PlayerOptions[pn].Init(); + GAMESTATE->m_PlayerOptions[pn].FromString( PREFSMAN->m_sDefaultModifiers ); break; case CODE_HIDDEN: TOGGLE_HIDDEN; break; case CODE_RANDOMVANISH: TOGGLE_RANDOMVANISH; break;