Update copyright notice

[empserver] / include / damage.h

diff --git a/include/damage.h b/include/damage.h
index 8a529d2a3933dc571fe9f5b1eec681404e7cfa40..ba841afdead09608ae7a990cbd6e9ce3248906e1 100644 (file)
--- 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-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,7 +26,7 @@
  *  ---
  *
  *  damage.h: Damage formulas
- * 
+ *
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
@@ -36,12 +36,13 @@
 #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 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() (10 + random()%11)
-#define DTORP_HITCHANCE(range, vis) ((double)(0.9/((range)+1)+(((vis)<6)?(5-(vis))*0.03:0)))
+#define MINE_LDAMAGE() (11 + random()%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))