Update copyright notice

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

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 07fe00b297a661b8880efe43ffd94da364065d7f..33223d486d696bbefc65a89d0f5e02a9465912ab 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-2012, 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 *);
@@ -70,7 +70,7 @@ shp_sel(struct nstr_item *ni, struct emp_qelem *list)
         * much of the code assumes that only the ship's owner can
         * navigate it.
         */
-       if (ship.shp_own != player->cnum)
+       if (!ship.shp_own || ship.shp_own != player->cnum)
            continue;
        mcp = &mchr[(int)ship.shp_type];
        if (opt_MARKET) {
@@ -100,8 +100,8 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
     struct emp_qelem *qp;
     struct emp_qelem *next;
     struct ulist *mlp;
+    struct shpstr *sp;
     struct sctstr sect;
-    struct shpstr ship;
     coord allx;
     coord ally;
     int first = 1;
@@ -112,31 +112,32 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
     for (qp = list->q_back; qp != list; qp = next) {
        next = qp->q_back;
        mlp = (struct ulist *)qp;
-       getship(mlp->unit.ship.shp_uid, &ship);
-       if (ship.shp_own != actor) {
+       sp = &mlp->unit.ship;
+       getship(sp->shp_uid, sp);
+       if (sp->shp_own != actor) {
            mpr(actor, "%s was sunk at %s\n",
-               prship(&ship), xyas(ship.shp_x, ship.shp_y, actor));
+               prship(sp), xyas(sp->shp_x, sp->shp_y, actor));
            emp_remque((struct emp_qelem *)mlp);
            free(mlp);
            continue;
        }
        if (opt_SAIL) {
-           if (*ship.shp_path && !update_running) {
+           if (*sp->shp_path && !update_running) {
                shp_stays(actor, "has a sail path", mlp);
                mpr(actor, "Use `sail <#> -' to reset\n");
                continue;
            }
        }
        /* check crew - uws don't count */
-       if (ship.shp_item[I_MILIT] == 0 && ship.shp_item[I_CIVIL] == 0) {
+       if (sp->shp_item[I_MILIT] == 0 && sp->shp_item[I_CIVIL] == 0) {
            shp_stays(actor, "is crewless", mlp);
            continue;
        }
-       if (!getsect(ship.shp_x, ship.shp_y, &sect)) {
+       if (!getsect(sp->shp_x, sp->shp_y, &sect)) {
            shp_stays(actor, "was sucked into the sky by a strange looking spaceship", mlp);    /* heh -KHS */
            continue;
        }
-       switch (shp_check_nav(&sect, &ship)) {
+       switch (shp_check_nav(&sect, sp)) {
        case CN_CONSTRUCTION:
            shp_stays(actor, "is caught in a construction zone", mlp);
            continue;
@@ -151,20 +152,19 @@ shp_nav(struct emp_qelem *list, double *minmobp, double *maxmobp,
            continue;
        }
        if (first) {
-           allx = ship.shp_x;
-           ally = ship.shp_y;
+           allx = sp->shp_x;
+           ally = sp->shp_y;
            first = 0;
        }
-       if (ship.shp_x != allx || ship.shp_y != ally)
+       if (sp->shp_x != allx || sp->shp_y != ally)
            *togetherp = 0;
-       if (ship.shp_mobil + 1 < (int)mlp->mobil) {
-           mlp->mobil = ship.shp_mobil;
+       if (sp->shp_mobil + 1 < (int)mlp->mobil) {
+           mlp->mobil = sp->shp_mobil;
        }
        if (mlp->mobil < *minmobp)
            *minmobp = mlp->mobil;
        if (mlp->mobil > *maxmobp)
            *maxmobp = mlp->mobil;
-       mlp->unit.ship = ship;
     }
 }
 
@@ -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)