Update copyright notice

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

diff --git a/src/lib/subs/fortdef.c b/src/lib/subs/fortdef.c
index aec624e8668e4123287a05fcd5296b890390bc97..752d2290b0b25f27f2e054092bbec3a6a551bcec 100644 (file)
--- a/src/lib/subs/fortdef.c
+++ b/src/lib/subs/fortdef.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, 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/>.
  *
  *  ---
  *
@@ -28,7 +27,7 @@
  *  fortdef.c: Fort defends an area.
  *
  *  Known contributors to this file:
- *
+ *     Markus Armbruster, 2006-2011
  */
 
 /*
@@ -39,7 +38,6 @@
 
 #include <config.h>
 
-#include "file.h"
 #include "nat.h"
 #include "news.h"
 #include "optlist.h"
@@ -47,7 +45,7 @@
 #include "sect.h"
 #include "ship.h"
 
-#define        NOISY   1
+#define NOISY  1
 
 static int sb(natid, natid, struct sctstr *, coord, coord, int, int);
 
@@ -71,7 +69,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
     double eff;
     struct shpstr ship;
     struct nstr_item ni;
-    int dam, rel, rel2;
+    int dam;
 
     if (own == 0)
        return 0;
@@ -80,15 +78,9 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
     eff = 1.0;
     snxtitem_dist(&ni, EF_SHIP, x, y, 8);
     while (nxtitem(&ni, &ship) && eff > 0.30) {
-       if (ship.shp_own == att)
-           continue;
-       if (ship.shp_own == 0)
+       if (!feels_like_helping(ship.shp_own, own, att))
            continue;
 
-       rel = getrel(getnatp(ship.shp_own), own);
-       rel2 = getrel(getnatp(ship.shp_own), att);
-       if ((ship.shp_own != own) && ((rel != ALLIED) || (rel2 != AT_WAR)))
-           continue;
        if ((mchr[(int)ship.shp_type].m_flags & M_SUB) && !usesubs)
            continue;
        range = roundrange(shp_fire_range(&ship));
@@ -131,7 +123,7 @@ sd(natid att, natid own, coord x, coord y, int noisy, int defending,
 int
 dd(natid att, natid def_own, coord ax, coord ay, int noisy, int defending)
 {
-    int dam, rel, rel2;
+    int dam;
     struct sctstr firing;
     struct nstr_sect ns;
 
@@ -144,13 +136,7 @@ dd(natid att, natid def_own, coord ax, coord ay, int noisy, int defending)
     dam = 0;
     snxtsct_dist(&ns, ax, ay, 8);
     while (nxtsct(&ns, &firing) && dam < 80) {
-       if (firing.sct_own == att)
-           continue;
-       if (firing.sct_own == 0)
-           continue;
-       rel = getrel(getnatp(firing.sct_own), def_own);
-       rel2 = getrel(getnatp(firing.sct_own), att);
-       if (firing.sct_own != def_own && (rel != ALLIED || rel2 != AT_WAR))
+       if (!feels_like_helping(firing.sct_own, def_own, att))
            continue;
        /* XXX defdef damage is additive, but ship or land unit damage isn't */
        dam += sb(att, def_own, &firing, ax, ay, noisy, defending);
@@ -158,6 +144,23 @@ dd(natid att, natid def_own, coord ax, coord ay, int noisy, int defending)
     return dam;
 }
 
+/*
+ * Shall @cn attempt to help @friend against @foe?
+ */
+int
+feels_like_helping(natid cn, natid friend, natid foe)
+{
+    if (cn == 0)
+       return 0;               /* never helps anybody */
+    if (cn == foe)
+       return 0;               /* don't help anybody against self */
+    if (cn == friend)
+       return 1;               /* help self against anybody else */
+    /* third party helps ally if at war with foe: */
+    return relations_with(cn, friend) == ALLIED
+       && relations_with(cn, foe) == AT_WAR;
+}
+
 /* Shoot back
  *
  * See if the sector being fired at will defend itself.