X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=include%2Fdamage.h;h=7abbbd4780f96763893e0ba72e1232e1821c2fba;hp=15135862c5e4412f74584afcfaecb392fc8942fe;hb=HEAD;hpb=345ad3dfe077b3c5c0a6613fbeff33f4adff1ad3

diff --git a/include/damage.h b/include/damage.h
index 15135862c..7abbbd478 100644
--- a/include/damage.h
+++ b/include/damage.h
@@ -1,11 +1,11 @@
 /*
  *  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-2021, 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,
@@ -14,35 +14,36 @@
  *  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.
  *
  *  ---
  *
  *  damage.h: Damage formulas
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2006-2012
  */
 
-#ifndef _DAMAGE_H_
-#define _DAMAGE_H_
+#ifndef DAMAGE_H
+#define DAMAGE_H
 
 #define PERCENT_DAMAGE(x) (100 * (x) / ((x) + 100))
-#define DPERCENT_DAMAGE(x) ((double)(100.0 * (x) / ((x) + 100.0)))
-#define DMINE_HITCHANCE(x) ((double) ( (x) / ((x)+20.0) ) )
-#define DMINE_LHITCHANCE(x) ((double) ( (x) / ((x)+35.0) ) )
-#define MINE_DAMAGE() (22 + random()%21)
-#define MINE_LDAMAGE() (10 + random()%11)
-#define DTORP_HITCHANCE(range, vis) ((double)(0.9/((range)+1)+(((vis)<6)?(5-(vis))*0.03:0)))
-#define TORP_DAMAGE() (torpedo_damage + (random() % torpedo_damage) + \
-		       (random() % torpedo_damage))
+#define DPERCENT_DAMAGE(x) (100.0 * (x) / ((x) + 100.0))
+#define DMINE_HITCHANCE(x) ((x) / ((x) + 20.0))
+#define DMINE_LHITCHANCE(x) ((x) / ((x) + 35.0))
+#define MINE_DAMAGE() (21 + roll(21))
+#define MINE_LDAMAGE() (10 + roll(20))
+#define DTORP_HITCHANCE(range, vis) \
+    (0.9 / ((range)+1) + (((vis) < 6) ? (5-(vis)) * 0.03 : 0.0))
+#define TORP_DAMAGE() (torpedo_damage + roll0(torpedo_damage) + \
+		       roll0(torpedo_damage))
 
-#endif /* _DAMAGE_H_ */
+#endif