sprinkle static

[bsdgames-darwin.git] / rogue / random.c

diff --git a/rogue/random.c b/rogue/random.c
index eee5c114f49af3293625cc2b140b5930ebcce09b..e527903c1173f6d3ef52dc2a572c5aa3219fa2f8 100644 (file)
--- a/rogue/random.c
+++ b/rogue/random.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: random.c,v 1.5 2003/08/07 09:37:39 agc Exp $   */
+/*     $NetBSD: random.c,v 1.7 2008/01/14 03:50:02 dholland Exp $      */
 
 /*
  * Copyright (c) 1988, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)random.c   8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: random.c,v 1.5 2003/08/07 09:37:39 agc Exp $");
+__RCSID("$NetBSD: random.c,v 1.7 2008/01/14 03:50:02 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,11 +56,11 @@ __RCSID("$NetBSD: random.c,v 1.5 2003/08/07 09:37:39 agc Exp $");
  */
 
 static long rntb[32] = {
-                3, 0x9a319039, 0x32d9c024, 0x9b663182, 0x5da1f342, 
+                3, 0x9a319039, 0x32d9c024, 0x9b663182, 0x5da1f342,
        0xde3b81e0, 0xdf0a6fb5, 0xf103bc02, 0x48f340fb, 0x7449e56b,
        0xbeb1dbb0, 0xab5c5918, 0x946554fd, 0x8c2e680f, 0xeb3d799f,
        0xb11ee0b7, 0x2d436b86, 0xda672e2a, 0x1588ca88, 0xe369735d,
-       0x904f35f7, 0xd7158fd6, 0x6fa6f051, 0x616e6b96, 0xac94efdc, 
+       0x904f35f7, 0xd7158fd6, 0x6fa6f051, 0x616e6b96, 0xac94efdc,
        0x36413f93, 0xc622c298, 0xf5a42ab8, 0x8a88d77b, 0xf5ad9d0e,
        0x8999220b, 0x27fb47b9
 };
@@ -74,12 +74,11 @@ static int rand_sep = 3;
 static long *end_ptr = &rntb[32];
 
 void
-srrandom(x)
-       int x;
+srrandom(int x)
 {
        int i;
 
-       state[0] = (long) x;
+       state[0] = x;
        if (rand_type != 0) {
                for (i = 1; i < rand_deg; i++) {
                        state[i] = 1103515245 * state[i - 1] + 12345;
@@ -87,16 +86,16 @@ srrandom(x)
                fptr = &state[rand_sep];
                rptr = &state[0];
                for (i = 0; i < 10 * rand_deg; i++) {
-                       (void) rrandom();
+                       (void)rrandom();
                }
        }
 }
 
 long
-rrandom()
+rrandom(void)
 {
        long i;
-       
+
        if (rand_type == 0) {
                i = state[0] = (state[0]*1103515245 + 12345) & 0x7fffffff;
        } else {
@@ -115,8 +114,7 @@ rrandom()
 }
 
 int
-get_rand(x, y)
-       int x, y;
+get_rand(int x, int y)
 {
        int r, t;
        long lr;
@@ -127,21 +125,20 @@ get_rand(x, y)
                x = t;
        }
        lr = rrandom();
-       lr &= (long) 0x00003fff;
-       r = (int) lr;
+       lr &= 0x00003fffL;
+       r = (int)lr;
        r = (r % ((y - x) + 1)) + x;
        return(r);
 }
 
 int
-rand_percent(percentage)
-       int percentage;
+rand_percent(int percentage)
 {
        return(get_rand(1, 100) <= percentage);
 }
 
 int
-coin_toss()
+coin_toss(void)
 {
        return(((rrandom() & 01) ? 1 : 0));
 }