Make damage() use roundavg()

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

diff --git a/src/lib/subs/damage.c b/src/lib/subs/damage.c
index 11684fb6f53c52b383e066238a10b91f55a812b0..a70390448fb5e97d3e2acf6d0182789381872cfe 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-2013, 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
@@ -74,15 +74,13 @@ ship_damage(struct shpstr *sp, int dam)
     sp->shp_effic = damage((int)sp->shp_effic, dam);
     if (sp->shp_mobil > 0)
        sp->shp_mobil = damage((int)sp->shp_mobil, dam);
-    if (opt_FUEL && sp->shp_fuel)
-       sp->shp_fuel = damage((int)sp->shp_fuel, dam);
     item_damage(dam, sp->shp_item);
 }
 
 void
 shipdamage(struct shpstr *sp, int dam)
 {
-    ship_damage(sp, (int)(dam / (1.0 + sp->shp_armor / 100.0)));
+    ship_damage(sp, (int)(dam / (1.0 + shp_armor(sp) / 100.0)));
 }
 
 void
@@ -101,8 +99,6 @@ land_damage(struct lndstr *lp, int dam)
        lp->lnd_effic = damage((int)lp->lnd_effic, dam);
        if (lp->lnd_mobil > 0)
            lp->lnd_mobil = damage((int)lp->lnd_mobil, dam);
-       if (opt_FUEL && lp->lnd_fuel)
-           lp->lnd_fuel = damage((int)lp->lnd_fuel, dam);
        item_damage(dam, lp->lnd_item);
     }
 }
@@ -118,7 +114,7 @@ landdamage(struct lndstr *lp, int dam)
     damage_factor = m / (m + lp->lnd_harden);
 
     /* vulnerable units take more damage */
-    damage_factor *= lp->lnd_vul / 100.0;
+    damage_factor *= lnd_vul(lp) / 100.0;
 
     land_damage(lp, ldround(damage_factor * dam, 1));
 }
@@ -167,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 */