actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed DefaultFail GamePref and reinstated DefaultFailType real preference. Should fix default fail related problems.

Browse Source
This commit is contained in:
Kyzentun
2014-09-15 00:04:41 -06:00
parent 2f37e9d8a9
commit 455431d8c3
9 changed files with 11 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenOptionsMasterPrefs.cpp
+1 -32
View File
@@ -480,37 +480,6 @@ static int GetLifeDifficulty()
LuaFunction( GetLifeDifficulty, GetLifeDifficulty() );
static void DefaultFailType( int &sel, bool ToSel, const ConfOption *pConfOption )
{
if( ToSel )
{
PlayerOptions po;
po.FromString( PREFSMAN->m_sDefaultModifiers );
sel = po.m_FailType;
}
else
{
PlayerOptions po;
SongOptions so;
GetPrefsDefaultModifiers( po, so );
switch( sel )
{
case 0: po.m_FailType = FailType_Immediate; break;
case 1: po.m_FailType = FailType_ImmediateContinue; break;
case 2: po.m_FailType = FailType_EndOfSong; break;
case 3: po.m_FailType = FailType_Off; break;
default:
{
LOG->Warn("Invalid fail type %d! Going to use the default...", sel);
po.m_FailType = FailType_Immediate; break;
}
}
SetPrefsDefaultModifiers( po, so );
}
}
// Graphic options
struct res_t
{
@@ -739,7 +708,7 @@ static void InitializeConfOptions()
ADD( ConfOption( "ProgressiveLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8") );
ADD( ConfOption( "ProgressiveStageLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") );
ADD( ConfOption( "ProgressiveNonstopLifebar", MovePref<int>, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") );
ADD( ConfOption( "DefaultFailType", DefaultFailType, "Immediate","ImmediateContinue","EndOfSong","Off" ) );
ADD( ConfOption( "DefaultFailType", MovePref<FailType>, "Immediate","ImmediateContinue","EndOfSong","Off" ) );
ADD( ConfOption( "CoinsPerCredit", CoinsPerCredit, "|1","|2","|3","|4","|5","|6","|7","|8","|9","|10","|11","|12","|13","|14","|15","|16" ) );
ADD( ConfOption( "Premium", MovePref<Premium>, "Off","Double for 1 Credit","2 Players for 1 Credit" ) );
ADD( ConfOption( "JointPremium", JointPremium, "Off","2 Players for 1 Credit" ) );