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

fix crash if hit a mine too early

Browse Source
This commit is contained in:
Chris Danford
2003-08-23 19:01:35 +00:00
parent 1e718a80a5
commit d69d19fc2a
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/NoteDataUtil.cpp
+15 -9
View File
@@ -643,8 +643,6 @@ void NoteDataUtil::InsertIntelligentTaps( NoteData &in, float fBeatInterval, flo
void NoteDataUtil::Mines( NoteData &in, float fStartBeat, float fEndBeat ) void NoteDataUtil::Mines( NoteData &in, float fStartBeat, float fEndBeat )
{ {
int iTapCount = 0;
int first_row = 0; int first_row = 0;
if( fStartBeat != -1 ) if( fStartBeat != -1 )
first_row = BeatToNoteRow(fStartBeat); first_row = BeatToNoteRow(fStartBeat);
@@ -653,14 +651,22 @@ void NoteDataUtil::Mines( NoteData &in, float fStartBeat, float fEndBeat )
if( fEndBeat != -1 ) if( fEndBeat != -1 )
last_row = BeatToNoteRow(fEndBeat); last_row = BeatToNoteRow(fEndBeat);
//
// Change whole rows at a time to be tap notes. Otherwise, it causes
// major problems for our scoring system. -Chris
//
int iRowCount = 0;
for( int r=first_row; r<=last_row; r++ ) for( int r=first_row; r<=last_row; r++ )
for( int t=0; t<in.GetNumTracks(); t++ ) if( !in.IsRowEmpty(r) )
if( in.GetTapNote(t,r) == TAP_TAP ) {
{ iRowCount++;
iTapCount++; // place every 6 or 7 rows
if( (iTapCount%7) == 6 ) if( (iRowCount%7)==6 || ((iRowCount%7)==5 && rand()%2) )
in.SetTapNote(t,r,TAP_MINE); for( int t=0; t<in.GetNumTracks(); t++ )
} if( in.GetTapNote(t,r) == TAP_TAP )
in.SetTapNote(t,r,TAP_MINE);
}
} }
stepmania/src/NoteDataWithScoring.cpp
-3
View File
@@ -107,9 +107,6 @@ TapNoteScore NoteDataWithScoring::MinTapNoteScore(unsigned row) const
/* If there's no tap note on this row, skip it, or else the score will always be TNS_NONE. */ /* If there's no tap note on this row, skip it, or else the score will always be TNS_NONE. */
if(GetTapNote(t, row) == TAP_EMPTY) if(GetTapNote(t, row) == TAP_EMPTY)
continue; continue;
/* Don't count mines - the goal is to miss those */
if(GetTapNote(t, row) == TAP_MINE)
continue;
score = min( score, GetTapNoteScore(t, row) ); score = min( score, GetTapNoteScore(t, row) );
} }