From 3a3102debe95ab3b81c8b6c66dbb01f1a6c72186 Mon Sep 17 00:00:00 2001 From: Jason Felds Date: Sat, 28 Oct 2006 04:03:52 +0000 Subject: [PATCH] Use the real formula for normal mode, and our own for courses. --- stepmania/src/ScoreKeeperNormal.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/stepmania/src/ScoreKeeperNormal.cpp b/stepmania/src/ScoreKeeperNormal.cpp index d282326c73..0c260e6aa5 100644 --- a/stepmania/src/ScoreKeeperNormal.cpp +++ b/stepmania/src/ScoreKeeperNormal.cpp @@ -207,12 +207,17 @@ static int GetScore(int p, int Z, int S, int n) * changes the scoring rules slightly. */ -#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); +#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; + } #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));