From b81c304eb60994a178dddf51e670ed49bf8a5f50 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 1 May 2005 04:35:29 +0000 Subject: [PATCH] rename FixImposibleRows -> RemoveStretch and turn it into a mod --- stepmania/src/NoteDataUtil.cpp | 5 +++-- stepmania/src/NoteDataUtil.h | 3 +-- stepmania/src/PlayerOptions.cpp | 6 ++++++ stepmania/src/PlayerOptions.h | 1 + stepmania/src/ScreenEdit.cpp | 5 +++-- stepmania/src/ScreenEdit.h | 1 + stepmania/src/Steps.cpp | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp index a688bd0e5a..e01d069bf1 100644 --- a/stepmania/src/NoteDataUtil.cpp +++ b/stepmania/src/NoteDataUtil.cpp @@ -1631,7 +1631,7 @@ const ValidRow g_ValidRows[] = { STEPS_TYPE_DANCE_DOUBLE, { f,f,f,f,T,T,T,T } }, }; -void NoteDataUtil::FixImpossibleRows( NoteData &inout, StepsType st ) +void NoteDataUtil::RemoveStretch( NoteData &inout, StepsType st, int iStartIndex, int iEndIndex ) { vector vpValidRowsToCheck; for( unsigned i=0; i &AddTo ) const if( m_bTransforms[TRANSFORM_NOJUMPS] ) AddTo.push_back( "NoJumps" ); if( m_bTransforms[TRANSFORM_NOHANDS] ) AddTo.push_back( "NoHands" ); if( m_bTransforms[TRANSFORM_NOQUADS] ) AddTo.push_back( "NoQuads" ); + if( m_bTransforms[TRANSFORM_NOSTRETCH] )AddTo.push_back( "NoStretch" ); if( m_fSkew==0 && m_fPerspectiveTilt==0 ) { if( m_bSetTiltOrSkew ) AddTo.push_back( "Overhead" ); } else if( m_fSkew==1 && m_fPerspectiveTilt==-1 ) AddTo.push_back( "Incoming" ); @@ -301,6 +302,7 @@ void PlayerOptions::FromString( CString sOptions, bool bWarnOnInvalid ) 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 == "nostretch" ) m_bTransforms[TRANSFORM_NOSTRETCH] = on; else if( sBit == "dark" ) SET_FLOAT( fDark ) else if( sBit == "blind" ) SET_FLOAT( fBlind ) else if( sBit == "cover" ) SET_FLOAT( fCover ) @@ -566,6 +568,8 @@ bool PlayerOptions::IsEasierForSongAndSteps( Song* pSong, Steps* pSteps ) return true; if( m_bTransforms[TRANSFORM_NOJUMPS] && pSteps->GetRadarValues()[RADAR_NUM_JUMPS]>0 ) return true; + if( m_bTransforms[TRANSFORM_NOSTRETCH] ) + return true; // Inserted holds can be really easy on some songs, and scores will be // highly hold-weighted, and very little tap score weighted. @@ -656,6 +660,7 @@ CString PlayerOptions::GetSavedPrefsString() const SAVE( m_bTransforms[TRANSFORM_NOJUMPS] ); SAVE( m_bTransforms[TRANSFORM_NOHANDS] ); SAVE( m_bTransforms[TRANSFORM_NOQUADS] ); + SAVE( m_bTransforms[TRANSFORM_NOSTRETCH] ); SAVE( m_ScoreDisplay ); SAVE( m_sNoteSkin ); #undef SAVE @@ -677,6 +682,7 @@ void PlayerOptions::ResetSavedPrefs() CPY( m_bTransforms[TRANSFORM_NOJUMPS] ); CPY( m_bTransforms[TRANSFORM_NOHANDS] ); CPY( m_bTransforms[TRANSFORM_NOQUADS] ); + CPY( m_bTransforms[TRANSFORM_NOSTRETCH] ); CPY( m_sNoteSkin ); #undef CPY } diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h index 98ead62422..205f0e7993 100644 --- a/stepmania/src/PlayerOptions.h +++ b/stepmania/src/PlayerOptions.h @@ -85,6 +85,7 @@ struct PlayerOptions TRANSFORM_NOJUMPS, TRANSFORM_NOHANDS, TRANSFORM_NOQUADS, + TRANSFORM_NOSTRETCH, NUM_TRANSFORMS }; enum Scroll { diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index ee0845b137..3dcc009a14 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -390,7 +390,7 @@ static Menu g_AreaMenu( MenuRow( ScreenEdit::clear, "Clear area", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRow( ScreenEdit::quantize, "Quantize", true, EDIT_MODE_PRACTICE, 0, "4th","8th","12th","16th","24th","32nd","48th","64th","192nd"), MenuRow( ScreenEdit::turn, "Turn", true, EDIT_MODE_PRACTICE, 0, "Left","Right","Mirror","Shuffle","SuperShuffle" ), - MenuRow( ScreenEdit::transform, "Transform", true, EDIT_MODE_PRACTICE, 0, "NoHolds","NoMines","Little","Wide","Big","Quick","Skippy","Mines","Echo","Stomp","Planted","Floored","Twister","NoJumps","NoHands","NoQuads" ), + MenuRow( ScreenEdit::transform, "Transform", true, EDIT_MODE_PRACTICE, 0, "NoHolds","NoMines","Little","Wide","Big","Quick","Skippy","Mines","Echo","Stomp","Planted","Floored","Twister","NoJumps","NoHands","NoQuads","NoStretch" ), MenuRow( ScreenEdit::alter, "Alter", true, EDIT_MODE_PRACTICE, 0, "Autogen To Fill Width","Backwards","Swap Sides","Copy Left To Right","Copy Right To Left","Clear Left","Clear Right","Collapse To One","Collapse Left","Shift Left","Shift Right" ), MenuRow( ScreenEdit::tempo, "Tempo", true, EDIT_MODE_FULL, 0, "Compress 2x","Compress 3->2","Compress 4->3","Expand 3->4","Expand 2->3","Expand 2x" ), MenuRow( ScreenEdit::play, "Play selection", true, EDIT_MODE_PRACTICE, 0, NULL ), @@ -2246,6 +2246,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns case nojumps: NoteDataUtil::RemoveJumps( m_NoteDataEdit, iBeginRow, iEndRow ); break; case nohands: NoteDataUtil::RemoveHands( m_NoteDataEdit, iBeginRow, iEndRow ); break; case noquads: NoteDataUtil::RemoveQuads( m_NoteDataEdit, iBeginRow, iEndRow ); break; + case nostretch: NoteDataUtil::RemoveStretch( m_NoteDataEdit, st, iBeginRow, iBeginRow ); break; default: ASSERT(0); } @@ -2269,7 +2270,7 @@ void ScreenEdit::HandleAreaMenuChoice( AreaMenuChoice c, const vector &iAns break; temp.SetNumTracks( iNumUsedTracks ); NoteDataUtil::LoadTransformedSlidingWindow( temp, m_Clipboard, m_Clipboard.GetNumTracks() ); - NoteDataUtil::FixImpossibleRows( m_Clipboard, GAMESTATE->m_pCurSteps[0]->m_StepsType ); + NoteDataUtil::RemoveStretch( m_Clipboard, GAMESTATE->m_pCurSteps[0]->m_StepsType ); } break; case backwards: NoteDataUtil::Backwards( m_Clipboard ); break; diff --git a/stepmania/src/ScreenEdit.h b/stepmania/src/ScreenEdit.h index a75241c67d..7951cb1318 100644 --- a/stepmania/src/ScreenEdit.h +++ b/stepmania/src/ScreenEdit.h @@ -298,6 +298,7 @@ public: nojumps, nohands, noquads, + nostretch, NUM_TRANSFORM_TYPES }; enum AlterType diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp index 3b3fb89047..e9ad4fd31a 100644 --- a/stepmania/src/Steps.cpp +++ b/stepmania/src/Steps.cpp @@ -191,7 +191,7 @@ void Steps::Decompress() const { NoteDataUtil::LoadTransformedSlidingWindow( notedata, m_NoteData, iNewTracks ); - NoteDataUtil::FixImpossibleRows( m_NoteData, m_StepsType ); + NoteDataUtil::RemoveStretch( m_NoteData, m_StepsType ); } return; }