simplify
This commit is contained in:
@@ -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 )
|
|
||||||
{
|
|
||||||
case PLAY_MODE_ARCADE:
|
|
||||||
case PLAY_MODE_HUMAN_BATTLE:
|
|
||||||
case PLAY_MODE_CPU_BATTLE:
|
|
||||||
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( ¬edata );
|
|
||||||
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
|
|
||||||
NoteData playerNoteData;
|
|
||||||
pStyleDef->GetTransformedNoteDataForStyle( pn_, ¬edata, &playerNoteData );
|
|
||||||
|
|
||||||
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = this->GetPossibleDancePoints( &playerNoteData );
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case PLAY_MODE_NONSTOP:
|
|
||||||
case PLAY_MODE_ONI:
|
|
||||||
case PLAY_MODE_ENDLESS:
|
|
||||||
{
|
|
||||||
int iTotalPossibleDancePoints = 0;
|
int iTotalPossibleDancePoints = 0;
|
||||||
for( unsigned i=0; i<apNotes.size(); i++ )
|
for( unsigned i=0; i<apNotes.size(); i++ )
|
||||||
{
|
{
|
||||||
|
Steps* pSteps = apNotes[0];
|
||||||
NoteData notedata;
|
NoteData notedata;
|
||||||
apNotes[i]->GetNoteData( ¬edata );
|
pSteps->GetNoteData( ¬edata );
|
||||||
|
|
||||||
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
|
const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
|
||||||
NoteData playerNoteData;
|
NoteData playerNoteData;
|
||||||
pStyleDef->GetTransformedNoteDataForStyle( pn_, ¬edata, &playerNoteData );
|
pStyleDef->GetTransformedNoteDataForStyle( pn_, ¬edata, &playerNoteData );
|
||||||
|
|
||||||
apNotes[i]->GetNoteData( &playerNoteData );
|
|
||||||
iTotalPossibleDancePoints += this->GetPossibleDancePoints( ¬edata );
|
iTotalPossibleDancePoints += this->GetPossibleDancePoints( ¬edata );
|
||||||
}
|
}
|
||||||
|
|
||||||
GAMESTATE->m_CurStageStats.pSong = NULL;
|
|
||||||
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = iTotalPossibleDancePoints;
|
GAMESTATE->m_CurStageStats.iPossibleDancePoints[pn_] = iTotalPossibleDancePoints;
|
||||||
}
|
|
||||||
break;
|
if( !GAMESTATE->IsCourseMode() )
|
||||||
default:
|
{
|
||||||
ASSERT(0);
|
ASSERT( !apNotes.empty() );
|
||||||
|
GAMESTATE->m_CurStageStats.pSong = GAMESTATE->m_pCurSong;
|
||||||
|
GAMESTATE->m_CurStageStats.iMeter[pn_] = apNotes[0]->GetMeter();
|
||||||
|
} else {
|
||||||
|
GAMESTATE->m_CurStageStats.pSong = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user