This commit is contained in:
Glenn Maynard
2003-08-12 00:51:34 +00:00
parent 31c2b8ff7b
commit e2523bf1e6
+2 -6
View File
@@ -415,18 +415,14 @@ int ScoreKeeperMAX2::GetPossibleDancePoints( const NoteData* pNoteData )
{ {
/* Note that, if Marvelous timing is disabled or not active (not course mode), /* Note that, if Marvelous timing is disabled or not active (not course mode),
* PERFECT will be used instead. */ * PERFECT will be used instead. */
return pNoteData->GetNumRowsWithTaps()*TapNoteScoreToDancePoints(TNS_MARVELOUS)+
TapNoteScore maxPossibleTapScore =
(GAMESTATE->ShowMarvelous() ) ? TNS_MARVELOUS : TNS_PERFECT;
return pNoteData->GetNumRowsWithTaps()*TapNoteScoreToDancePoints(maxPossibleTapScore)+
pNoteData->GetNumHoldNotes()*HoldNoteScoreToDancePoints(HNS_OK); pNoteData->GetNumHoldNotes()*HoldNoteScoreToDancePoints(HNS_OK);
} }
int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns ) int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns )
{ {
if(!GAMESTATE->ShowMarvelous() && tns == TNS_MARVELOUS) if( !GAMESTATE->ShowMarvelous() && tns == TNS_MARVELOUS )
tns = TNS_PERFECT; tns = TNS_PERFECT;
/* /*