Use PlayerAI FailType to reduce mod setting consistency issues

some mods save and some dont, so when you are defaulted on immediate then watch a failoff replay, you end up stuck on failoff and thats no good
poco0317 · Nov 24, 2019 · 85a3aa6 · 85a3aa6
1 parent 158ac01
commit 85a3aa6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp b/src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp
@@ -103,6 +103,14 @@ ScreenGameplayReplay::~ScreenGameplayReplay()
 			  PlayerAI::oldNoteskin;
 			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().m_sNoteSkin =
 			  PlayerAI::oldNoteskin;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred()
+			  .m_FailType = PlayerAI::oldFailType;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_FailType =
+			  PlayerAI::oldFailType;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().m_FailType =
+			  PlayerAI::oldFailType;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().m_FailType =
+			  PlayerAI::oldFailType;
 		}
 		GAMESTATE->m_SongOptions.Init();
 		GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate =

diff --git a/src/Etterna/Screen/Others/ScreenSelectMusic.cpp b/src/Etterna/Screen/Others/ScreenSelectMusic.cpp
@@ -1709,11 +1709,14 @@ class LunaScreenSelectMusic : public Luna<ScreenSelectMusic>
 		PlayerAI::oldRate = oldRate;
 		auto ns =
 		  GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_sNoteSkin;
+		auto ft =
+		  GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_FailType;
 		if (ns.empty())
 			ns = CommonMetrics::DEFAULT_NOTESKIN_NAME;
 		PlayerAI::oldNoteskin = ns;
 		RString hsMods = hs->GetModifiers();
 		PlayerAI::replayModifiers = hsMods;
+		PlayerAI::oldFailType = ft;
 
 		// lock the game into replay mode and GO
 		LOG->Trace("Viewing replay for score key %s",