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

add norolls

Browse Source
This commit is contained in:
Glenn Maynard
2005-04-25 09:42:26 +00:00
parent 598a3d86b3
commit 1c3323fac7
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+3 -1
View File
@@ -1709,8 +1709,10 @@ void NoteDataUtil::TransformNoteData( NoteData &nd, const AttackArray &aa, Steps
void NoteDataUtil::TransformNoteData( NoteData &nd, const PlayerOptions &po, StepsType st, int iStartIndex, int iEndIndex )
{
// Apply remove transforms before others so that we don't go removing
// notes we just inserted.
// notes we just inserted. Apply TRANSFORM_NOROLLS before TRANSFORM_NOHOLDS,
// since NOROLLS creates holds.
if( po.m_bTransforms[PlayerOptions::TRANSFORM_LITTLE] ) NoteDataUtil::Little( nd, iStartIndex, iEndIndex );
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOROLLS] ) NoteDataUtil::ChangeRollsToHolds( nd, iStartIndex, iEndIndex );
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOHOLDS] ) NoteDataUtil::RemoveHoldNotes( nd, iStartIndex, iEndIndex );
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOMINES] ) NoteDataUtil::RemoveMines( nd, iStartIndex, iEndIndex );
if( po.m_bTransforms[PlayerOptions::TRANSFORM_NOJUMPS] ) NoteDataUtil::RemoveJumps( nd, iStartIndex, iEndIndex );
stepmania/src/PlayerOptions.cpp
+6
View File
@@ -153,6 +153,7 @@ void PlayerOptions::GetMods( vector<CString> &AddTo ) const
if( m_bTurns[TURN_SUPER_SHUFFLE] ) AddTo.push_back( "SuperShuffle" );
if( m_bTransforms[TRANSFORM_NOHOLDS] ) AddTo.push_back( "NoHolds" );
if( m_bTransforms[TRANSFORM_NOROLLS] ) AddTo.push_back( "NoRolls" );
if( m_bTransforms[TRANSFORM_NOMINES] ) AddTo.push_back( "NoMines" );
if( m_bTransforms[TRANSFORM_LITTLE] ) AddTo.push_back( "Little" );
if( m_bTransforms[TRANSFORM_WIDE] ) AddTo.push_back( "Wide" );
@@ -302,6 +303,7 @@ void PlayerOptions::FromString( CString sOptions, bool bWarnOnInvalid )
else if( sBit == "cross" ) SET_FLOAT( fScrolls[SCROLL_CROSS] )
else if( sBit == "centered" || sBit == "converge" ) SET_FLOAT( fScrolls[SCROLL_CENTERED] )
else if( sBit == "noholds" || sBit == "nofreeze" ) m_bTransforms[TRANSFORM_NOHOLDS] = on;
else if( sBit == "norolls" ) m_bTransforms[TRANSFORM_NOROLLS] = on;
else if( sBit == "nomines" ) m_bTransforms[TRANSFORM_NOMINES] = on;
else if( sBit == "dark" ) SET_FLOAT( fDark )
else if( sBit == "blind" ) SET_FLOAT( fBlind )
@@ -558,6 +560,8 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps )
return true;
if( m_bTransforms[TRANSFORM_NOHOLDS] && pSteps->GetRadarValues()[RADAR_NUM_HOLDS]>0 )
return true;
if( m_bTransforms[TRANSFORM_NOROLLS] && pSteps->GetRadarValues()[RADAR_NUM_ROLLS]>0 )
return true;
if( m_bTransforms[TRANSFORM_NOMINES] && pSteps->GetRadarValues()[RADAR_NUM_MINES]>0 )
return true;
if( m_bTransforms[TRANSFORM_NOHANDS] && pSteps->GetRadarValues()[RADAR_NUM_HANDS]>0 )
@@ -651,6 +655,7 @@ CString PlayerOptions::GetSavedPrefsString() const
SAVE( m_fScrolls[SCROLL_REVERSE] );
SAVE( m_fPerspectiveTilt );
SAVE( m_bTransforms[TRANSFORM_NOHOLDS] );
SAVE( m_bTransforms[TRANSFORM_NOROLLS] );
SAVE( m_bTransforms[TRANSFORM_NOMINES] );
SAVE( m_bTransforms[TRANSFORM_NOJUMPS] );
SAVE( m_bTransforms[TRANSFORM_NOHANDS] );
@@ -671,6 +676,7 @@ void PlayerOptions::ResetSavedPrefs()
CPY( m_fScrolls[SCROLL_REVERSE] );
CPY( m_fPerspectiveTilt );
CPY( m_bTransforms[TRANSFORM_NOHOLDS] );
CPY( m_bTransforms[TRANSFORM_NOROLLS] );
CPY( m_bTransforms[TRANSFORM_NOMINES] );
CPY( m_bTransforms[TRANSFORM_NOJUMPS] );
CPY( m_bTransforms[TRANSFORM_NOHANDS] );
stepmania/src/PlayerOptions.h
+1
View File
@@ -68,6 +68,7 @@ struct PlayerOptions
};
enum Transform {
TRANSFORM_NOHOLDS,
TRANSFORM_NOROLLS,
TRANSFORM_NOMINES,
TRANSFORM_LITTLE,
TRANSFORM_WIDE,