FailEndOfSong sounds like "fail at the end of the song", but

actually means "fail immediately, but you can play the rest
of the song anyway".  Rename FAIL_END_OF_SONG to
FAIL_IMMEDIATE_CONTINUE, to reflect this better.
This commit is contained in:
Glenn Maynard
2006-11-09 07:49:49 +00:00
parent 93e85f9125
commit ff4376868f
4 changed files with 9 additions and 8 deletions
+3 -2
View File
@@ -60,7 +60,7 @@ void SongOptions::GetMods( vector<RString> &AddTo ) const
switch( m_FailType )
{
case FAIL_IMMEDIATE: break;
case FAIL_END_OF_SONG: AddTo.push_back("FailEndOfSong"); break;
case FAIL_IMMEDIATE_CONTINUE: AddTo.push_back("FailImmediateContinue"); break;
case FAIL_OFF: AddTo.push_back("FailOff"); break;
default: ASSERT(0);
}
@@ -152,7 +152,8 @@ void SongOptions::FromString( const RString &sOptions )
else if( sBit == "normal-drain" ) m_DrainType = DRAIN_NORMAL;
else if( sBit == "failarcade" ||
sBit == "failimmediate" ) m_FailType = FAIL_IMMEDIATE;
else if( sBit == "failendofsong" ) m_FailType = FAIL_END_OF_SONG;
else if( sBit == "failendofsong" ||
sBit == "failimmediatecontinue" ) m_FailType = FAIL_IMMEDIATE_CONTINUE;
else if( sBit == "failoff" ) m_FailType = FAIL_OFF;
else if( sBit == "faildefault" )