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

diff --git a/include/damage.h b/include/damage.h
index 3ef3a334c..7abbbd478 100644
--- a/include/damage.h
+++ b/include/damage.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -29,6 +29,7 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2006-2012
  */
 
 #ifndef DAMAGE_H
@@ -38,11 +39,11 @@
 #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() (22 + random()%21)
-#define MINE_LDAMAGE() (11 + random()%20)
+#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 + (random() % torpedo_damage) + \
-		       (random() % torpedo_damage))
+#define TORP_DAMAGE() (torpedo_damage + roll0(torpedo_damage) + \
+		       roll0(torpedo_damage))
 
 #endif