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

fix endless crash

Browse Source
This commit is contained in:
Glenn Maynard
2003-06-29 20:49:57 +00:00
parent a09a79c2f2
commit 6ae4237530
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScoreKeeperMAX2.cpp
+14 -3
View File
@@ -83,6 +83,11 @@ void ScoreKeeperMAX2::OnNextSong( int iSongInCourseIndex, Notes* pNotes )
20,000,000 for the second song 20,000,000 for the second song
30,000,000 for the third song 30,000,000 for the third song
40,000,000 for the fourth song 40,000,000 for the fourth song
We extend this to work with nonstop courses of any length.
We also keep track of this scoring type in endless, with 100mil per iteration
of all songs, though this score isn't actually seen anywhere right now.
*/ */
// //
// Calculate the score multiplier // Calculate the score multiplier
@@ -93,15 +98,15 @@ void ScoreKeeperMAX2::OnNextSong( int iSongInCourseIndex, Notes* pNotes )
const int numSongsInCourse = apNotes.size(); const int numSongsInCourse = apNotes.size();
ASSERT( numSongsInCourse != 0 ); ASSERT( numSongsInCourse != 0 );
if ( iSongInCourseIndex == numSongsInCourse - 1 ) const int iIndex = iSongInCourseIndex % numSongsInCourse;
m_bIsLastSongInCourse = true; m_bIsLastSongInCourse = (iIndex+1 == numSongsInCourse);
if( numSongsInCourse < 10 ) if( numSongsInCourse < 10 )
{ {
const int courseMult = (numSongsInCourse * (numSongsInCourse + 1)) / 2; const int courseMult = (numSongsInCourse * (numSongsInCourse + 1)) / 2;
ASSERT(courseMult >= 0); ASSERT(courseMult >= 0);
m_iMaxPossiblePoints = (100000000 * (iSongInCourseIndex+1)) / courseMult; m_iMaxPossiblePoints = (100000000 * (iIndex+1)) / courseMult;
} }
else else
{ {
@@ -201,7 +206,13 @@ void ScoreKeeperMAX2::AddScore( TapNoteScore score )
{ {
m_iScore += m_iPointBonus; m_iScore += m_iPointBonus;
if ( m_bIsLastSongInCourse ) if ( m_bIsLastSongInCourse )
{
m_iScore += 100000000 - m_iMaxScoreSoFar; m_iScore += 100000000 - m_iMaxScoreSoFar;
/* If we're in Endless mode, we'll come around here again, so reset
* the bonus counter. */
m_iMaxScoreSoFar = 0;
}
} }
ASSERT(m_iScore >= 0); ASSERT(m_iScore >= 0);