Update known contributors comments

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

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 07fe00b297a661b8880efe43ffd94da364065d7f..05d2112d09b024a8c0e0674cc968ae10f3bb7d0b 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.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-2011, 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/>.
  *
  *  ---
  *
@@ -30,17 +29,19 @@
  *  Known contributors to this file:
  *     Ken Stevens, 1995
  *     Steve McClure, 1996-2000
- *     Markus Armbruster, 2006-2009
+ *     Markus Armbruster, 2006-2010
  */
 
 #include <config.h>
 
 #include <stdlib.h>
 #include "damage.h"
+#include "empobj.h"
 #include "file.h"
 #include "map.h"
 #include "misc.h"
 #include "mission.h"
+#include "news.h"
 #include "nsc.h"
 #include "optlist.h"
 #include "path.h"
@@ -48,9 +49,8 @@
 #include "prototypes.h"
 #include "queue.h"
 #include "server.h"
-#include "xy.h"
-#include "empobj.h"
 #include "unit.h"
+#include "xy.h"
 
 static int shp_check_one_mines(struct ulist *);
 static int shp_hit_mine(struct shpstr *);
@@ -589,7 +589,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
 
     /* Inform neutral and worse */
     for (i = 0; i < MAXNOC; ++i) {
-       if (getrel(getnatp(i), victim) <= NEUTRAL)
+       if (relations_with(i, victim) <= NEUTRAL)
            notified[i] = 0;
        else
            notified[i] = 1;
@@ -611,7 +611,7 @@ shp_fort_interdiction(struct emp_qelem *list, coord newx, coord newy,
        return 0;               /* Only coastwatch notify in nofortfire */
     /* Only fire at Hostile ships */
     for (i = 0; i < MAXNOC; ++i) {
-       if (getrel(getnatp(i), victim) >= NEUTRAL)
+       if (relations_with(i, victim) >= NEUTRAL)
            notified[i] = 0;
     }
     snxtsct_dist(&ns, newx, newy, fort_max_interdiction_range);
@@ -750,8 +750,7 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor,
        navigate = shp_check_nav(&sect, &mlp->unit.ship);
        if (navigate != CN_NAVIGABLE ||
            (sect.sct_own
-            && sect.sct_own != actor
-            && getrel(getnatp(sect.sct_own), actor) < FRIENDLY)) {
+            && relations_with(sect.sct_own, actor) < FRIENDLY)) {
            if (dchr[sect.sct_type].d_nav == NAV_CANAL &&
                !(((struct mchrstr *)mlp->chrp)->m_flags & M_CANAL) &&
                navigate == CN_LANDLOCKED)
@@ -850,7 +849,7 @@ shp_missile_defense(coord dx, coord dy, natid bombown, int hardtarget)
        if (!(mchr[(int)ship.shp_type].m_flags & M_ANTIMISSILE))
            continue;
 
-       if (getrel(getnatp(ship.shp_own), bombown) >= NEUTRAL)
+       if (relations_with(ship.shp_own, bombown) >= NEUTRAL)
            continue;
 
        if (ship.shp_effic < 60)