From 6b240f51abc3ea31eaf970a23910bf91fa675978 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 29 Oct 2006 03:58:41 +0000
Subject: [PATCH] revert.  Self-consistency over blind emulation; no rationale
 was given for this change.  (I'm sort of inclined to remove this entirely and
 do something new, though ...)

---
 stepmania/src/ScoreKeeperNormal.cpp | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp
index 0c260e6aa5..d282326c73 100644
--- a/stepmania/src/ScoreKeeperNormal.cpp
+++ b/stepmania/src/ScoreKeeperNormal.cpp
@@ -207,17 +207,12 @@ static int GetScore(int p, int Z, int S, int n)
 	 * changes the scoring rules slightly.
 	 */
 
-#if 1
-	if ( GAMESTATE->IsCourseMode() )
-	{
-		/* This doesn't round down Z/S, but will work for courses. */
-		return int(int64_t(p) * n * Z / S);
-	}
-	else
-	{
-		/* This is the actual method described in the comment block above. */
-		return p * (Z / S) * n;
-	}
+#if 0
+	/* This is the actual method described below. */
+	return p * (Z / S) * n;
+#elif 1
+	/* This doesn't round down Z/S. */
+	return int(int64_t(p) * n * Z / S);
 #else
 	/* This also doesn't round down Z/S. Use this if you don't have 64-bit ints. */
 	return int(p * n * (float(Z) / S));