License upgrade to GPL version 3 or later

[empserver] / src / lib / update / nav_ship.c

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index 9670f1382d6b10b26477179ecf28ac2b86763fa8..972d8b63c893f6b113b886ac5dcd656296ae9147 100644 (file)
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.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-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/>.
  *
  *  ---
  *
@@ -142,10 +141,10 @@ swap(struct shpstr *sp)
  */
 
 static int
-nav_loadship(struct shpstr *sp, natid cnum)
+nav_loadship(struct shpstr *sp)
 {
     struct sctstr *sectp;
-    int i, landown, shipown, didsomething[TMAX], rel;
+    int i, didsomething[TMAX], rel;
 
     for (i = 0; i < TMAX; i++)
        didsomething[i] = 0;
@@ -160,9 +159,7 @@ nav_loadship(struct shpstr *sp, natid cnum)
     if (!(sectp = getsectp(sp->shp_x, sp->shp_y)))
        return 0;               /* safety */
 
-    landown = sectp->sct_own;
-    shipown = sp->shp_own;
-    rel = getrel(getnatp(sectp->sct_own), cnum);
+    rel = relations_with(sectp->sct_own, sp->shp_own);
 
     /* loop through each field for that ship */
     for (i = 0; i < TMAX; ++i) {
@@ -173,7 +170,7 @@ nav_loadship(struct shpstr *sp, natid cnum)
            didsomething[i] = 1;
            continue;
        }
-       if (landown == 0) {
+       if (sectp->sct_own == 0) {
            /* either sea or deity harbor */
            didsomething[i] = 1;
            continue;
@@ -183,7 +180,7 @@ nav_loadship(struct shpstr *sp, natid cnum)
            didsomething[i] = 1;
            continue;
        }
-       if (landown == shipown || rel >= FRIENDLY)
+       if (rel >= FRIENDLY)
            didsomething[i] = load_it(sp, sectp, i);
     }
 
@@ -255,24 +252,20 @@ nav_ship(struct shpstr *sp)
     int dummyint;
     double dummydouble;
     int dir;
-    natid cnum;
 
     /* just return if no autonaving to do for this ship */
     if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY))
        return 0;
 
-    cnum = sp->shp_own;
-
     /* Make a list of one ships so we can use the navi.c code */
     emp_initque(&ship_list);
     mlp = malloc(sizeof(struct ulist));
     mlp->chrp = (struct empobj_chr *)(mchr + sp->shp_type);
     mlp->unit.ship = *sp;
+    ef_mark_fresh(EF_SHIP, &mlp->unit.ship);
     mlp->mobil = sp->shp_mobil;
     emp_insque(&mlp->queue, &ship_list);
 
-    quit = 1;                  /* setup loop, we want to check it 1 time. */
-
     do {
        if ((sp->shp_mobil > 0) && (!(sp->shp_autonav & AN_LOADING)) &&
            (!(sp->shp_autonav & AN_STANDBY))) {
@@ -284,8 +277,8 @@ nav_ship(struct shpstr *sp)
            cp = BestShipPath(buf, sp->shp_x, sp->shp_y,
                              sp->shp_destx[0], sp->shp_desty[0],
                              sp->shp_own);
-           if (cp == 0) {
-               wu(0, cnum,
+           if (!cp) {
+               wu(0, sp->shp_own,
                   "%s bad path, ship put on standby\n", prship(sp));
                sp->shp_autonav |= AN_STANDBY;
                putship(sp->shp_uid, sp);
@@ -317,7 +310,7 @@ nav_ship(struct shpstr *sp)
 
        /* Try to load the ship */
        if (sp->shp_autonav & AN_LOADING) {
-           didsomething = nav_loadship(sp, cnum);
+           didsomething = nav_loadship(sp);
            if (didsomething)
                quit = 1;
        }