Make absolutely sure that Replays don't mess up mods & noteskins

Author: poco0317

src/Etterna/Models/Misc/PlayerAI.cpp

@@ -18,6 +18,7 @@ float PlayerAI::replayRate = 1.f;
 RString PlayerAI::replayModifiers = "";
 RString PlayerAI::oldModifiers = "";
 float PlayerAI::oldRate = 1.f;
+RString PlayerAI::oldNoteskin = "";
 
 TapNoteScore
 PlayerAI::GetTapNoteScore(const PlayerState* pPlayerState)
@@ -73,6 +74,7 @@ PlayerAI::ResetScoreData()
 	replayModifiers.clear();
 	oldModifiers.clear();
 	oldRate = 1.f;
+	oldNoteskin.clear();
 }
 
 void

src/Etterna/Models/Misc/PlayerAI.h

@@ -53,6 +53,7 @@ class PlayerAI
 
 	static RString oldModifiers;
 	static RString replayModifiers;
+	static RString oldNoteskin;
 	static float replayRate;
 	static float oldRate;
 

src/Etterna/Screen/Gameplay/ScreenGameplayReplay.cpp

@@ -44,10 +44,6 @@ ScreenGameplayReplay::ScreenGameplayReplay()
 	ASSERT_M(PlayerAI::pScoreData != nullptr,
 			 "Replay Highscore Info was empty.");
 
-	// Save current noteskin
-	auto ns =
-	  GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_sNoteSkin;
-
 	// Set up rate
 	GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate = PlayerAI::replayRate;
 
@@ -56,10 +52,22 @@ ScreenGameplayReplay::ScreenGameplayReplay()
 		GAMESTATE->m_pPlayerState->m_PlayerOptions.Init();
 		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().FromString(
 		  PlayerAI::replayModifiers);
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().FromString(
+		  PlayerAI::replayModifiers);
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().FromString(
+		  PlayerAI::replayModifiers);
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().FromString(
+		  PlayerAI::replayModifiers);
 
 		// Undo noteskin change
-		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred()
-		  .FromOneModString(ns, RString());
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_sNoteSkin =
+		  PlayerAI::oldNoteskin;
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().m_sNoteSkin =
+		  PlayerAI::oldNoteskin;
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().m_sNoteSkin =
+		  PlayerAI::oldNoteskin;
+		GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().m_sNoteSkin =
+		  PlayerAI::oldNoteskin;
 	}
 }
 
@@ -81,6 +89,20 @@ ScreenGameplayReplay::~ScreenGameplayReplay()
 			GAMESTATE->m_pPlayerState->m_PlayerOptions.Init();
 			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred()
 			  .FromString(PlayerAI::oldModifiers);
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent().FromString(
+			  PlayerAI::oldModifiers);
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().FromString(
+			  PlayerAI::oldModifiers);
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().FromString(
+			  PlayerAI::oldModifiers);
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred()
+			  .m_sNoteSkin = PlayerAI::oldNoteskin;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetCurrent()
+			  .m_sNoteSkin = PlayerAI::oldNoteskin;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetSong().m_sNoteSkin =
+			  PlayerAI::oldNoteskin;
+			GAMESTATE->m_pPlayerState->m_PlayerOptions.GetStage().m_sNoteSkin =
+			  PlayerAI::oldNoteskin;
 		}
 		GAMESTATE->m_SongOptions.Init();
 		GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate =

src/Etterna/Screen/Others/ScreenSelectMusic.cpp

@@ -1701,6 +1701,11 @@ class LunaScreenSelectMusic : public Luna<ScreenSelectMusic>
 		PlayerAI::replayRate = scoreRate;
 		PlayerAI::oldModifiers = oldMods;
 		PlayerAI::oldRate = oldRate;
+		auto ns =
+		  GAMESTATE->m_pPlayerState->m_PlayerOptions.GetPreferred().m_sNoteSkin;
+		if (ns.empty())
+			ns = CommonMetrics::DEFAULT_NOTESKIN_NAME;
+		PlayerAI::oldNoteskin = ns;
 
 		// set mods based on the score, hopefully
 		// it is known that xmod->cmod and back does not work most of the time.