/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
- * 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.
*
* ---
*
* chance.c: return 1 if "roll" is under the chance.
- *
+ *
* Known contributors to this file:
- *
+ *
*/
-#include "gen.h"
+#include <config.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;
}
/*
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));
}