From 81aa716f7d0f2f152ed8a2bc62e6f1d3f8fa8673 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 26 Sep 2003 00:47:51 +0000
Subject: [PATCH] If a percentage is being displayed when playing oni mode,
 only count marvelous as 2 dance points. This makes the percentage consistent
 with Max2 and also playing a single song on battery and playing a single song
 oni course will be graded the same.

---
 stepmania/src/ScoreKeeperMAX2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stepmania/src/ScoreKeeperMAX2.cpp b/stepmania/src/ScoreKeeperMAX2.cpp
index 3fded68471..4bb467beca 100644
--- a/stepmania/src/ScoreKeeperMAX2.cpp
+++ b/stepmania/src/ScoreKeeperMAX2.cpp
@@ -477,7 +477,7 @@ int ScoreKeeperMAX2::TapNoteScoreToDancePoints( TapNoteScore tns )
 	case PLAY_MODE_ONI:
 		switch( tns )
 		{
-		case TNS_MARVELOUS:	return +3;
+		case TNS_MARVELOUS:	return (PREFSMAN->m_bDancePointsForOni ? +3 : +2);
 		case TNS_PERFECT:	return +2;
 		case TNS_GREAT:		return +1;
 		case TNS_GOOD:		return +0;