From e2523bf1e68803f95a29d65eb2b700efbb79376d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 12 Aug 2003 00:51:34 +0000 Subject: [PATCH] simplify --- stepmania/src/ScoreKeeperMAX2.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp index a4785e356f..d695c4e36d 100644 --- a/stepmania/src/ScoreKeeperMAX2.cpp +++ b/stepmania/src/ScoreKeeperMAX2.cpp @@ -415,18 +415,14 @@ int ScoreKeeperMAX2::GetPossibleDancePoints( const NoteData* pNoteData ) { /* Note that, if Marvelous timing is disabled or not active (not course mode), * PERFECT will be used instead. */ - - TapNoteScore maxPossibleTapScore = - (GAMESTATE->ShowMarvelous() ) ? TNS_MARVELOUS : TNS_PERFECT; - - return pNoteData->GetNumRowsWithTaps()*TapNoteScoreToDancePoints(maxPossibleTapScore)+ + return pNoteData->GetNumRowsWithTaps()*TapNoteScoreToDancePoints(TNS_MARVELOUS)+ pNoteData->GetNumHoldNotes()*HoldNoteScoreToDancePoints(HNS_OK); } int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns ) { - if(!GAMESTATE->ShowMarvelous() && tns == TNS_MARVELOUS) + if( !GAMESTATE->ShowMarvelous() && tns == TNS_MARVELOUS ) tns = TNS_PERFECT; /*