Fixed bug that caused global fail setting to override setting the fail type from song options. Added GAMESTATE:SetFailTypeExplicitlySet so that a theme with a custom song options screen can protect its fail setting from being overridden the same way the engine ScreenSongOptions does.

2014-06-20 13:54:56 -06:00
parent 006fcd84a7
commit 3a788651e5
8 changed files with 90 additions and 48 deletions
@@ -30,7 +30,9 @@ void ScreenSongOptions::ExportOptions( int iRow, const vector<PlayerNumber> &vpn
 	ScreenOptionsMaster::ExportOptions( iRow, vpns );

 	if( ft != pPS->m_PlayerOptions.GetPreferred().m_FailType )
-		GAMESTATE->m_bChangedFailTypeOnScreenSongOptions = true;
+	{
+		GAMESTATE->m_bFailTypeWasExplicitlySet = true;
+	}
 }

 /*