fish: use arc4random_uniform for drawing random numbers

[bsdgames-darwin.git] / monop / roll.c

diff --git a/monop/roll.c b/monop/roll.c
index 07395fa954c4b4c712df97e5d43fc5a1115b727f..373fc73311293511ee69d16eb90e384fe768f5e9 100644 (file)
--- a/monop/roll.c
+++ b/monop/roll.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: roll.c,v 1.9 2003/08/07 09:37:29 agc Exp $     */
+/*     $NetBSD: roll.c,v 1.14 2012/06/19 05:35:32 dholland Exp $       */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,47 +34,25 @@
 #if 0
 static char sccsid[] = "@(#)roll.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: roll.c,v 1.9 2003/08/07 09:37:29 agc Exp $");
+__RCSID("$NetBSD: roll.c,v 1.14 2012/06/19 05:35:32 dholland Exp $");
 #endif
 #endif /* not lint */
 
-#include "monop.ext"
 #include <stdlib.h>
 
+#include "monop.h"
+
 /*
  *     This routine rolls ndie nside-sided dice.
  */
 
-#if defined(pdp11)
-#define        MAXRAND 32767L
-
 int
-roll(ndie, nsides)
-       int ndie, nsides;
+roll(int ndie, int nsides)
 {
        long tot;
-       unsigned n, r;
 
-       tot = 0;
-       n = ndie;
-       while (n--)
-               tot += rand();
-       return (int) ((tot * (long) nsides) / ((long) MAXRAND + 1)) + ndie;
-}
-
-#else
-
-int
-roll(ndie, nsides)
-       int ndie, nsides;
-{
-       int tot, r;
-       double num_sides;
-
-       num_sides = nsides;
        tot = 0;
        while (ndie--)
-               tot += (r = rand()) * (num_sides / RAND_MAX) + 1;
-       return tot;
+               tot += (random() % nsides) + 1;
+       return (int)tot;
 }
-#endif