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

fixed InsertIntelligentTaps inserting notes that are too close together (runs of 16ths in the same track in Cartoon Heroes heavy + big)

Browse Source 
fixed small editor issues
This commit is contained in:
Chris Danford
2003-02-20 21:50:01 +00:00
parent d9ad14bbaf
commit dc2f57d587
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/metrics.ini
+1 -1
View File
@@ -21,7 +21,7 @@ DefaultScrollDirection=0
[ScreenTitleMenu] [ScreenTitleMenu]
ChoicesX=320 ChoicesX=320
ChoicesStartY=92 ChoicesStartY=92
ChoicesSpacingY=48 ChoicesSpacingY=52
ChoicesShadowLength=5 ChoicesShadowLength=5
HelpX=320 HelpX=320
HelpY=440 HelpY=440
stepmania/src/MenuElements.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ void MenuElements::Load( CString sBackgroundPath, CString sTopEdgePath, CString
} }
m_MenuTimer.SetXY( TIMER_X, TIMER_Y ); m_MenuTimer.SetXY( TIMER_X, TIMER_Y );
if( !bTimerEnabled || !PREFSMAN->m_bMenuTimer ) if( !bTimerEnabled || !PREFSMAN->m_bMenuTimer || GAMESTATE->m_bEditing )
{ {
m_MenuTimer.SetTimer( 99 ); m_MenuTimer.SetTimer( 99 );
m_MenuTimer.Update( 0 ); m_MenuTimer.Update( 0 );
stepmania/src/NoteData.cpp
+1 -1
View File
@@ -1075,7 +1075,7 @@ void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fBeatInterval )
// don't insert a new note if there's already one within this interval // don't insert a new note if there's already one within this interval
bool bNoteInMiddle = false; bool bNoteInMiddle = false;
for( int j=iRowEarlier+1; j<=iRowLater-1; j++ ) for( int j=iRowEarlier+1; j<=iRowLater-1; j++ )
if( !in.IsRowEmpty(iRowMiddle) ) if( !in.IsRowEmpty(j) )
{ {
bNoteInMiddle = true; bNoteInMiddle = true;
break; break;
stepmania/src/ScreenEdit.cpp
+7 -7
View File
@@ -624,7 +624,7 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
m_fDestinationScrollSpeed = 2; m_fDestinationScrollSpeed = 2;
m_soundMarker.Play(); m_soundMarker.Play();
} }
else if( m_fDestinationScrollSpeed == 2 ) else // if( m_fDestinationScrollSpeed == 2 )
{ {
m_fDestinationScrollSpeed = 1; m_fDestinationScrollSpeed = 1;
m_soundMarker.Play(); m_soundMarker.Play();
@@ -633,16 +633,16 @@ void ScreenEdit::InputEdit( const DeviceInput& DeviceI, const InputEventType typ
} }
else if( DeviceI.button == SDLK_DOWN ) else if( DeviceI.button == SDLK_DOWN )
{ {
if( m_fDestinationScrollSpeed == 1 ) if( m_fDestinationScrollSpeed == 2 )
{
m_fDestinationScrollSpeed = 2;
m_soundMarker.Play();
}
else if( m_fDestinationScrollSpeed == 2 )
{ {
m_fDestinationScrollSpeed = 4; m_fDestinationScrollSpeed = 4;
m_soundMarker.Play(); m_soundMarker.Play();
} }
else //if( m_fDestinationScrollSpeed == 1 )
{
m_fDestinationScrollSpeed = 2;
m_soundMarker.Play();
}
break; break;
} }
} }