This commit is contained in:
Glenn Maynard
2003-08-05 20:38:12 +00:00
parent 8d40a35d59
commit c3666c2ef5
+18 -41
View File
@@ -29,51 +29,28 @@ ScoreKeeperMAX2::ScoreKeeperMAX2( const vector<Steps*>& apNotes_, PlayerNumber p
// //
// Fill in m_CurStageStats, calculate multiplier // Fill in m_CurStageStats, calculate multiplier
// //
switch( GAMESTATE->m_PlayMode ) int iTotalPossibleDancePoints = 0;
for( unsigned i=0; i<apNotes.size(); i++ )
{ {
case PLAY_MODE_ARCADE: Steps* pSteps = apNotes[0];
case PLAY_MODE_HUMAN_BATTLE: NoteData notedata;
case PLAY_MODE_CPU_BATTLE: pSteps->GetNoteData( &notedata );
case PLAY_MODE_RAVE:
{
NoteData notedata;
ASSERT( !apNotes.empty() );
Steps* pNotes = apNotes[0];
GAMESTATE->m_CurStageStats.pSong = GAMESTATE->m_pCurSong;
GAMESTATE->m_CurStageStats.iMeter[pn_] = pNotes->GetMeter();
pNotes->GetNoteData( &notedata ); const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); NoteData playerNoteData;
NoteData playerNoteData; pStyleDef->GetTransformedNoteDataForStyle( pn_, &notedata, &playerNoteData );
pStyleDef->GetTransformedNoteDataForStyle( pn_, &notedata, &playerNoteData );
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = this->GetPossibleDancePoints( &playerNoteData ); iTotalPossibleDancePoints += this->GetPossibleDancePoints( &notedata );
} }
break; GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = iTotalPossibleDancePoints;
case PLAY_MODE_NONSTOP:
case PLAY_MODE_ONI:
case PLAY_MODE_ENDLESS:
{
int iTotalPossibleDancePoints = 0;
for( unsigned i=0; i<apNotes.size(); i++ )
{
NoteData notedata;
apNotes[i]->GetNoteData( &notedata );
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef(); if( !GAMESTATE->IsCourseMode() )
NoteData playerNoteData; {
pStyleDef->GetTransformedNoteDataForStyle( pn_, &notedata, &playerNoteData ); ASSERT( !apNotes.empty() );
GAMESTATE->m_CurStageStats.pSong = GAMESTATE->m_pCurSong;
apNotes[i]->GetNoteData( &playerNoteData ); GAMESTATE->m_CurStageStats.iMeter[pn_] = apNotes[0]->GetMeter();
iTotalPossibleDancePoints += this->GetPossibleDancePoints( &notedata ); } else {
} GAMESTATE->m_CurStageStats.pSong = NULL;
GAMESTATE->m_CurStageStats.pSong = NULL;
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = iTotalPossibleDancePoints;
}
break;
default:
ASSERT(0);
} }