Update copyright notice

[empserver] / src / lib / gen / chance.c

diff --git a/src/lib/gen/chance.c b/src/lib/gen/chance.c
index 71cbab4b3f6062aaeec57d2a52987669b0d22e71..fc9ab3edb43e6631ed6ffacb04dff805f15d968c 100644 (file)
--- a/src/lib/gen/chance.c
+++ b/src/lib/gen/chance.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -33,24 +33,19 @@
 
 #include <config.h>
 
-#include "gen.h"
+#include <math.h>
+#include "prototypes.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
 roll(int n)
 {
-    return (random() % n) + 1;
+    return 1 + random() % n;
 }
 
 /*
@@ -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));
 }