properly load/store fail preference when turning on/off practice mode

etternagame · May 19, 2019 · 6271e50 · 6271e50
1 parent c16a0f5
commit 6271e50
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp b/src/Etterna/Screen/Gameplay/ScreenGameplay.cpp
@@ -347,16 +347,6 @@ ScreenGameplay::Init()
 	GAMESTATE->SetPaused(false);
 	m_fReplayBookmarkSeconds = 0.f;
 
-	// Force FailOff in Practice Mode
-	if (GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_bPractice) {
-		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_FailType =
-		  FailType_Off;
-		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().m_FailType =
-		  FailType_Off;
-		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_FailType =
-		  FailType_Off;
-	}
-
 	int player = 1;
 	FOREACH_EnabledPlayerInfo(m_vPlayerInfo, pi)
 	{
@@ -604,6 +594,18 @@ ScreenGameplay::Init()
 	m_gave_up = false;
 	m_skipped_song = false;
 
+	// Force FailOff in Practice Mode
+	if (GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_bPractice) {
+		GAMEMAN->m_iPreviousFail =
+		  GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_FailType;
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_FailType =
+		  FailType_Off;
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().m_FailType =
+		  FailType_Off;
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_FailType =
+		  FailType_Off;
+	}
+
 	if (!GAMEMAN->m_bRestartedGameplay &&
 		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_bPractice) {
 		GAMEMAN->m_bResetModifiers = true;

diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp
@@ -97,14 +97,14 @@ ScreenSelectMusic::Init()
 		  ->m_PlayerOptions.GetCurrent()
 		  .m_bPractice) {
 		GAMESTATE->m_pPlayerState
-		  ->m_PlayerOptions.GetPreferred()
-		  .m_FailType = FailType_Immediate;
+		  ->m_PlayerOptions.GetPreferred().m_FailType =
+		  GAMEMAN->m_iPreviousFail;
 		GAMESTATE->m_pPlayerState
 		  ->m_PlayerOptions.GetSong()
-		  .m_FailType = FailType_Immediate;
+		  .m_FailType = GAMEMAN->m_iPreviousFail;
 		GAMESTATE->m_pPlayerState
 		  ->m_PlayerOptions.GetCurrent()
-		  .m_FailType = FailType_Immediate;
+		  .m_FailType = GAMEMAN->m_iPreviousFail;
 	}
 
 	IDLE_COMMENT_SECONDS.Load(m_sName, "IdleCommentSeconds");