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 ...)
This commit is contained in:
Glenn Maynard
2006-10-29 03:58:41 +00:00
parent 0e8a2ecd5b
commit 6b240f51ab
+6 -11
View File
@@ -207,17 +207,12 @@ static int GetScore(int p, int Z, int S, int n)
* changes the scoring rules slightly. * changes the scoring rules slightly.
*/ */
#if 1 #if 0
if ( GAMESTATE->IsCourseMode() ) /* This is the actual method described below. */
{ return p * (Z / S) * n;
/* This doesn't round down Z/S, but will work for courses. */ #elif 1
return int(int64_t(p) * n * Z / S); /* This doesn't round down Z/S. */
} 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 #else
/* This also doesn't round down Z/S. Use this if you don't have 64-bit ints. */ /* 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)); return int(p * n * (float(Z) / S));