Update copyright notice

[empserver] / src / lib / subs / damage.c

diff --git a/src/lib/subs/damage.c b/src/lib/subs/damage.c
index b0b763d290bb2004821850283b49fd3a9e444581..05925a2fe1b1565178d369761170a69534f5e148 100644 (file)
--- a/src/lib/subs/damage.c
+++ b/src/lib/subs/damage.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2018, 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,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,14 +25,16 @@
  *  ---
  *
  *  damage.c: Damage stuff.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1997
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
+#include "chance.h"
 #include "damage.h"
 #include "land.h"
 #include "misc.h"
@@ -42,7 +43,6 @@
 #include "optlist.h"
 #include "plane.h"
 #include "prototypes.h"
-#include "sect.h"
 #include "ship.h"
 
 void
@@ -163,16 +163,9 @@ nukedamage(struct nchrstr *ncp, int range, int airburst)
 int
 damage(int amt, int pct)
 {
-    int tmp;
-    int lost;
-
     if (amt <= 0)
        return 0;
-    tmp = amt * pct;
-    lost = tmp / 100;
-    if (random() % 100 < tmp % 100)
-       lost++;
-    return amt - lost;
+    return amt - roundavg(amt * (pct / 100.0));
 }
 
 /* asymptotic damage to commodities, efficiency, and sectors */