Update copyright notice

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

diff --git a/src/lib/subs/sectdamage.c b/src/lib/subs/sectdamage.c
index 6dcacbb7036f948a5a138866fd29b1deea622b9f..ece0baf928c7a9b2c98a9f97711e653d5949961a 100644 (file)
--- a/src/lib/subs/sectdamage.c
+++ b/src/lib/subs/sectdamage.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,7 +25,7 @@
  *  ---
  *
  *  sectdamage.c: Damage a sector
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1996
@@ -39,7 +38,6 @@
 #include "file.h"
 #include "land.h"
 #include "misc.h"
-#include "nat.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "plane.h"
@@ -49,7 +47,7 @@
 #include "xy.h"
 
 int
-sect_damage(struct sctstr *sp, int dam, struct emp_qelem *list)
+sect_damage(struct sctstr *sp, int dam)
 {
     int eff;
 
@@ -69,19 +67,13 @@ sect_damage(struct sctstr *sp, int dam, struct emp_qelem *list)
     if (sp->sct_mobil > 0)
        sp->sct_mobil = damage(sp->sct_mobil, dam);
     item_damage(dam, sp->sct_item);
-    if (opt_EASY_BRIDGES == 0) {
-       if (sp->sct_effic < SCT_MINEFF && sp->sct_type == SCT_BHEAD)
-           bridgefall(sp, list);
-    } else {
-       if (sp->sct_effic < SCT_MINEFF && sp->sct_type == SCT_BSPAN)
-           knockdown(sp, list);
-    }
+    bridge_damaged(sp);
     putsect(sp);
     return eff;
 }
 
 int
-sectdamage(struct sctstr *sp, int dam, struct emp_qelem *list)
+sectdamage(struct sctstr *sp, int dam)
 {
     struct nstr_item ni;
     struct lndstr land;
@@ -93,7 +85,7 @@ sectdamage(struct sctstr *sp, int dam, struct emp_qelem *list)
     /* the damage accordingly. Makes forts a pain */
     dam = ldround(dam / sector_strength(sp), 1);
 
-    eff = sect_damage(sp, PERCENT_DAMAGE(dam), list);
+    eff = sect_damage(sp, PERCENT_DAMAGE(dam));
 
     /* Damage all the land units in the sector */
     /* Units don't take full damage */
@@ -120,9 +112,6 @@ sectdamage(struct sctstr *sp, int dam, struct emp_qelem *list)
            continue;
        if (plane.pln_ship >= 0)
            continue;
-       /* Is this plane flying in this list? */
-       if (ac_isflying(&plane, list))
-           continue;
        planedamage(&plane, dam);
        putplane(plane.pln_uid, &plane);
     }