Set failoff for all replays

(galaxy brain)
etternagame · Dec 4, 2018 · a16f36d · a16f36d
1 parent 2a6d3ec
commit a16f36d
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 2 deletions.
diff --git a/src/GameManager.cpp b/src/GameManager.cpp
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "global.h"
 #include "Foreach.h"
 #include "Game.h"
 #include "GameConstantsAndTypes.h"
@@ -3227,6 +3227,7 @@ GameManager::GameManager()
 	m_fPreviousRate = 1.f;
 	m_sModsToReset;
 	m_vTurnsToReset;
+	m_iPreviousFail;
 	// Register with Lua.
 	{
 		Lua* L = LUA->Get();

diff --git a/src/GameManager.h b/src/GameManager.h
@@ -1,4 +1,4 @@
-/** @brief GameManager - Manages Games and Styles. */
+/** @brief GameManager - Manages Games and Styles. */
 
 #ifndef GAMEMANAGER_H
 #define GAMEMANAGER_H
@@ -63,6 +63,7 @@ class GameManager
 	float m_fPreviousRate;
 	RString m_sModsToReset;
 	vector<RString> m_vTurnsToReset;
+	FailType m_iPreviousFail;
 
 	// Lua
 	void PushSelf(lua_State* L);

diff --git a/src/ScreenEvaluation.cpp b/src/ScreenEvaluation.cpp
@@ -852,10 +852,21 @@ ScreenEvaluation::HandleMenuStart()
 		GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.GetCurrent().FromString(mods);
 		GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.GetPreferred().FromString(mods);
 		*/
+		FailType failreset = GAMEMAN->m_iPreviousFail;
+		GAMESTATE->m_pPlayerState[PLAYER_1]
+		  ->m_PlayerOptions.GetSong()
+		  .m_FailType = failreset;
+		GAMESTATE->m_pPlayerState[PLAYER_1]
+		  ->m_PlayerOptions.GetCurrent()
+		  .m_FailType = failreset;
+		GAMESTATE->m_pPlayerState[PLAYER_1]
+		  ->m_PlayerOptions.GetPreferred()
+		  .m_FailType = failreset;
 		GAMESTATE->m_SongOptions.GetSong().m_fMusicRate = oldRate;
 		GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate = oldRate;
 		GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate = oldRate;
 		GAMEMAN->m_bResetModifiers = false;
+
 		const vector<RString> oldturns = GAMEMAN->m_vTurnsToReset;
 		if (GAMEMAN->m_bResetTurns) {
 			GAMESTATE->m_pPlayerState[PLAYER_1]

diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
@@ -1770,6 +1770,19 @@ ScreenGameplay::Update(float fDeltaTime)
 							  oldRate;
 							GAMESTATE->m_SongOptions.GetPreferred()
 							  .m_fMusicRate = oldRate;
+							FailType failreset = GAMEMAN->m_iPreviousFail;
+							GAMESTATE->m_pPlayerState[PLAYER_1]
+							  ->m_PlayerOptions.GetSong()
+							  .m_FailType =
+							  failreset;
+							GAMESTATE->m_pPlayerState[PLAYER_1]
+							  ->m_PlayerOptions.GetCurrent()
+							  .m_FailType =
+							  failreset;
+							GAMESTATE->m_pPlayerState[PLAYER_1]
+							  ->m_PlayerOptions.GetPreferred()
+							  .m_FailType =
+							  failreset;
 							GAMEMAN->m_bResetModifiers = false;
 							GAMEMAN->m_sModsToReset = "";
 							MESSAGEMAN->Broadcast("RateChanged");
@@ -2119,6 +2132,19 @@ ScreenGameplay::Input(const InputEventPlus& input)
 						  oldRate;
 						GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate =
 						  oldRate;
+						FailType failreset = GAMEMAN->m_iPreviousFail;
+						GAMESTATE->m_pPlayerState[PLAYER_1]
+						  ->m_PlayerOptions.GetSong()
+						  .m_FailType =
+						  failreset;
+						GAMESTATE->m_pPlayerState[PLAYER_1]
+						  ->m_PlayerOptions.GetCurrent()
+						  .m_FailType =
+						  failreset;
+						GAMESTATE->m_pPlayerState[PLAYER_1]
+						  ->m_PlayerOptions.GetPreferred()
+						  .m_FailType =
+						  failreset;
 						GAMEMAN->m_bResetModifiers = false;
 						GAMEMAN->m_sModsToReset = "";
 						MESSAGEMAN->Broadcast("RateChanged");

diff --git a/src/ScreenSelectMusic.cpp b/src/ScreenSelectMusic.cpp
@@ -1822,6 +1822,20 @@ class LunaScreenSelectMusic : public Luna<ScreenSelectMusic>
 		}
 		GAMEMAN->m_bResetTurns = true;
 		GAMEMAN->m_vTurnsToReset = oldTurns;
+		GAMEMAN->m_iPreviousFail = GAMESTATE->m_pPlayerState[PLAYER_1]
+										->m_PlayerOptions.GetSong()
+										.m_FailType;
+
+		// REALLY BAD way to set fail off for a replay
+		GAMESTATE->m_pPlayerState[PLAYER_1]
+		  ->m_PlayerOptions.GetSong()
+		  .m_FailType = FailType_Off;
+		GAMESTATE->m_pPlayerState[PLAYER_1]
+		  ->m_PlayerOptions.GetCurrent()
+		  .m_FailType = FailType_Off;
+		GAMESTATE->m_pPlayerState[PLAYER_1]
+		  ->m_PlayerOptions.GetPreferred()
+		  .m_FailType = FailType_Off;
 
 		// lock the game into replay mode and GO
 		LOG->Trace("Viewing replay for score key %s",
@@ -1900,6 +1914,10 @@ class LunaScreenSelectMusic : public Luna<ScreenSelectMusic>
 		GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate = scoreRate;
 		GAMESTATE->m_SongOptions.GetPreferred().m_fMusicRate = scoreRate;
 		MESSAGEMAN->Broadcast("RateChanged");
+
+		GAMEMAN->m_iPreviousFail = GAMESTATE->m_pPlayerState[PLAYER_1]
+										->m_PlayerOptions.GetSong()
+										.m_FailType;
 
 		// go
 		LOG->Trace("Viewing evaluation screen for score key %s",