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.

src/GameState.cpp

@@ -292,7 +292,7 @@ void GameState::Reset()
 	*m_Environment = LuaTable();
 	m_sPreferredSongGroup.Set( GROUP_ALL );
 	m_sPreferredCourseGroup.Set( GROUP_ALL );
-	m_bChangedFailTypeOnScreenSongOptions = false;
+	m_bFailTypeWasExplicitlySet = false;
 	m_SortOrder.Set( SortOrder_Invalid );
 	m_PreferredSortOrder = GetDefaultSort();
 	m_PlayMode.Set( PlayMode_Invalid );
@@ -1540,7 +1540,7 @@ FailType GameState::GetPlayerFailType( const PlayerState *pPlayerState ) const
 	FailType ft = pPlayerState->m_PlayerOptions.GetCurrent().m_FailType;
 
 	// If the player changed the fail mode explicitly, leave it alone.
-	if( m_bChangedFailTypeOnScreenSongOptions )
+	if( m_bFailTypeWasExplicitlySet )
 		return ft;
 
 	if( IsCourseMode() )
@@ -2579,6 +2579,12 @@ public:
 		return 0;
 	}
 
+	static int SetFailTypeExplicitlySet(T* p, lua_State* L)
+	{
+		p->m_bFailTypeWasExplicitlySet= true;
+		return 0;
+	}
+
 	static int StoreRankingName( T* p, lua_State *L )
 	{
 		p->StoreRankingName(Enum::Check<PlayerNumber>(L, 1), SArg(2));
@@ -2703,6 +2709,7 @@ public:
 		ADD_METHOD( SaveProfiles );
 		ADD_METHOD( HaveProfileToLoad );
 		ADD_METHOD( HaveProfileToSave );
+		ADD_METHOD( SetFailTypeExplicitlySet );
 		ADD_METHOD( StoreRankingName );
 	}
 };

src/GameState.h

@@ -176,7 +176,7 @@ public:
 
 	BroadcastOnChange<RString>	m_sPreferredSongGroup;		// GROUP_ALL denotes no preferred group
 	BroadcastOnChange<RString>	m_sPreferredCourseGroup;	// GROUP_ALL denotes no preferred group
-	bool		m_bChangedFailTypeOnScreenSongOptions;	// true if FailType was changed in the song options screen
+	bool		m_bFailTypeWasExplicitlySet;	// true if FailType was changed in the song options screen
 	BroadcastOnChange<StepsType>				m_PreferredStepsType;
 	BroadcastOnChange1D<Difficulty,NUM_PLAYERS>		m_PreferredDifficulty;
 	BroadcastOnChange1D<CourseDifficulty,NUM_PLAYERS>	m_PreferredCourseDifficulty;// used in nonstop

src/ScreenSongOptions.cpp

@@ -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;
+	}
 }
 
 /*