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

Add FailAtEnd, which means "check failure only at the very

Browse Source 
end of the song" (intended for use with "PassMark", which
needs a better name).  This isn't called "FailEndOfSong" to
avoid confusion, and was the prompting for renaming
FailEndOfSong.)
This commit is contained in:
Glenn Maynard
2006-11-09 09:09:40 +00:00
parent f20ce1377b
commit 08bf61191d
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenGameplay.cpp
+3 -2
View File
@@ -1604,7 +1604,7 @@ void ScreenGameplay::Update( float fDeltaTime )
SongOptions::FailType ft = GAMESTATE->GetPlayerFailType( pi->GetPlayerState() ); SongOptions::FailType ft = GAMESTATE->GetPlayerFailType( pi->GetPlayerState() );
SongOptions::LifeType lt = GAMESTATE->m_SongOptions.GetCurrent().m_LifeType; SongOptions::LifeType lt = GAMESTATE->m_SongOptions.GetCurrent().m_LifeType;
if( ft == SongOptions::FAIL_OFF ) if( ft == SongOptions::FAIL_OFF || ft == SongOptions::FAIL_AT_END )
continue; continue;
// check for individual fail // check for individual fail
@@ -1649,7 +1649,8 @@ void ScreenGameplay::Update( float fDeltaTime )
if( pi->m_pLifeMeter && !pi->m_pLifeMeter->IsFailing() ) if( pi->m_pLifeMeter && !pi->m_pLifeMeter->IsFailing() )
bAllFailed = false; bAllFailed = false;
break; break;
case SongOptions::FAIL_END_OF_SONG: case SongOptions::FAIL_IMMEDIATE_CONTINUE:
case SongOptions::FAIL_AT_END:
bAllFailed = false; // wait until the end of the song to fail. bAllFailed = false; // wait until the end of the song to fail.
break; break;
case SongOptions::FAIL_OFF: case SongOptions::FAIL_OFF:
stepmania/src/ScreenOptionsMasterPrefs.cpp
+3 -2
View File
@@ -451,7 +451,8 @@ static void DefaultFailType( int &sel, bool ToSel, const ConfOption *pConfOption
{ {
case 0: so.m_FailType = SongOptions::FAIL_IMMEDIATE; break; case 0: so.m_FailType = SongOptions::FAIL_IMMEDIATE; break;
case 1: so.m_FailType = SongOptions::FAIL_IMMEDIATE_CONTINUE; break; case 1: so.m_FailType = SongOptions::FAIL_IMMEDIATE_CONTINUE; break;
case 2: so.m_FailType = SongOptions::FAIL_OFF; break; case 2: so.m_FailType = SongOptions::FAIL_AT_END; break;
case 3: so.m_FailType = SongOptions::FAIL_OFF; break;
default: default:
ASSERT(0); ASSERT(0);
} }
@@ -652,7 +653,7 @@ static void InitializeConfOptions()
ADD( ConfOption( "ProgressiveLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8") ); ADD( ConfOption( "ProgressiveLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8") );
ADD( ConfOption( "ProgressiveStageLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") ); ADD( ConfOption( "ProgressiveStageLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") );
ADD( ConfOption( "ProgressiveNonstopLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") ); ADD( ConfOption( "ProgressiveNonstopLifebar", MovePref, "Off","|1","|2","|3","|4","|5","|6","|7","|8","Insanity") );
ADD( ConfOption( "DefaultFailType", DefaultFailType, "Immediate","End of Song","Off" ) ); ADD( ConfOption( "DefaultFailType", DefaultFailType, "Immediate","Delayed","End of Song","Off" ) );
ADD( ConfOption( "CoinsPerCredit", CoinsPerCredit, "|1","|2","|3","|4","|5","|6","|7","|8","|9","|10","|11","|12","|13","|14","|15","|16" ) ); ADD( ConfOption( "CoinsPerCredit", CoinsPerCredit, "|1","|2","|3","|4","|5","|6","|7","|8","|9","|10","|11","|12","|13","|14","|15","|16" ) );
ADD( ConfOption( "Premium", PremiumM, "Off","Double for 1 Credit","Joint Premium" ) ); ADD( ConfOption( "Premium", PremiumM, "Off","Double for 1 Credit","Joint Premium" ) );
ADD( ConfOption( "ShowSongOptions", ShowSongOptions, "Hide","Show","Ask" ) ); ADD( ConfOption( "ShowSongOptions", ShowSongOptions, "Hide","Show","Ask" ) );
stepmania/src/SongOptions.cpp
+2
View File
@@ -61,6 +61,7 @@ void SongOptions::GetMods( vector<RString> &AddTo ) const
{ {
case FAIL_IMMEDIATE: break; case FAIL_IMMEDIATE: break;
case FAIL_IMMEDIATE_CONTINUE: AddTo.push_back("FailImmediateContinue"); break; case FAIL_IMMEDIATE_CONTINUE: AddTo.push_back("FailImmediateContinue"); break;
case FAIL_AT_END: AddTo.push_back("FailAtEnd"); break;
case FAIL_OFF: AddTo.push_back("FailOff"); break; case FAIL_OFF: AddTo.push_back("FailOff"); break;
default: ASSERT(0); default: ASSERT(0);
} }
@@ -154,6 +155,7 @@ void SongOptions::FromString( const RString &sOptions )
sBit == "failimmediate" ) m_FailType = FAIL_IMMEDIATE; sBit == "failimmediate" ) m_FailType = FAIL_IMMEDIATE;
else if( sBit == "failendofsong" || else if( sBit == "failendofsong" ||
sBit == "failimmediatecontinue" ) m_FailType = FAIL_IMMEDIATE_CONTINUE; sBit == "failimmediatecontinue" ) m_FailType = FAIL_IMMEDIATE_CONTINUE;
else if( sBit == "failatend" ) m_FailType = FAIL_AT_END;
else if( sBit == "failoff" ) m_FailType = FAIL_OFF; else if( sBit == "failoff" ) m_FailType = FAIL_OFF;
else if( sBit == "faildefault" ) else if( sBit == "faildefault" )
stepmania/src/SongOptions.h
+1
View File
@@ -25,6 +25,7 @@ public:
enum FailType { enum FailType {
FAIL_IMMEDIATE=0, // fail immediately when life touches 0 FAIL_IMMEDIATE=0, // fail immediately when life touches 0
FAIL_IMMEDIATE_CONTINUE, // fail immediately when life touches 0, but allow playing the rest of the song FAIL_IMMEDIATE_CONTINUE, // fail immediately when life touches 0, but allow playing the rest of the song
FAIL_AT_END, // fail if life is at 0 when the song ends
FAIL_OFF }; // never fail FAIL_OFF }; // never fail
FailType m_FailType; FailType m_FailType;
float m_fMusicRate, m_SpeedfMusicRate; float m_fMusicRate, m_SpeedfMusicRate;