From b9017dbde965b8b6d8409bfa816291723a579236 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 17 Jun 2006 12:40:25 +0000 Subject: [PATCH] (chance, roundavg): Simplify. No functional change. --- src/lib/gen/chance.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/lib/gen/chance.c b/src/lib/gen/chance.c index 1898d0116..2f8017f95 100644 --- a/src/lib/gen/chance.c +++ b/src/lib/gen/chance.c @@ -33,18 +33,13 @@ #include +#include #include "gen.h" int chance(double d) { - double roll; - - roll = random() & 0x7fff; - - if (d > roll / 32768.0) - return 1; - return 0; + return d > (random() % 32768) / 32768.0; } int @@ -60,12 +55,6 @@ roll(int n) int roundavg(double val) { - int flr; - - flr = (int)val; - if (val < 0) - flr -= chance(flr - val); - else - flr += chance(val - flr); - return flr; + double flr = floor(val); + return (int)(flr + chance(val - flr)); } -- 2.43.0