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

fix couple dance points calculation

Browse Source
This commit is contained in:
Chris Danford
2003-08-04 00:05:42 +00:00
parent 8549108a1f
commit 22c6d2ca4c
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScoreKeeperMAX2.cpp
+14 -2
View File
@@ -29,7 +29,6 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, PlayerNumber p
// //
// Fill in m_CurStageStats, calculate multiplier // Fill in m_CurStageStats, calculate multiplier
// //
NoteData notedata;
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
case PLAY_MODE_ARCADE: case PLAY_MODE_ARCADE:
@@ -37,12 +36,18 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, PlayerNumber p
case PLAY_MODE_CPU_BATTLE: case PLAY_MODE_CPU_BATTLE:
case PLAY_MODE_RAVE: case PLAY_MODE_RAVE:
{ {
NoteData notedata;
ASSERT( !apNotes.empty() ); ASSERT( !apNotes.empty() );
Steps* pNotes = apNotes[0]; Steps* pNotes = apNotes[0];
GAMESTATE->m_CurStageStats.pSong = GAMESTATE->m_pCurSong; GAMESTATE->m_CurStageStats.pSong = GAMESTATE->m_pCurSong;
GAMESTATE->m_CurStageStats.iMeter[pn_] = pNotes->GetMeter(); GAMESTATE->m_CurStageStats.iMeter[pn_] = pNotes->GetMeter();
pNotes->GetNoteData( &notedata ); pNotes->GetNoteData( &notedata );
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = this->GetPossibleDancePoints( &notedata ); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
NoteData playerNoteData;
pStyleDef->GetTransformedNoteDataForStyle( pn_, &notedata, &playerNoteData );
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = this->GetPossibleDancePoints( &playerNoteData );
} }
break; break;
case PLAY_MODE_NONSTOP: case PLAY_MODE_NONSTOP:
@@ -52,7 +57,14 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, PlayerNumber p
int iTotalPossibleDancePoints = 0; int iTotalPossibleDancePoints = 0;
for( unsigned i=0; i<apNotes.size(); i++ ) for( unsigned i=0; i<apNotes.size(); i++ )
{ {
NoteData notedata;
apNotes[i]->GetNoteData( &notedata ); apNotes[i]->GetNoteData( &notedata );
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
NoteData playerNoteData;
pStyleDef->GetTransformedNoteDataForStyle( pn_, &notedata, &playerNoteData );
apNotes[i]->GetNoteData( &playerNoteData );
iTotalPossibleDancePoints += this->GetPossibleDancePoints( &notedata ); iTotalPossibleDancePoints += this->GetPossibleDancePoints( &notedata );
} }