Eliminate nav_loadship() variables landown, shipown

Code is clearer without them.  Works because load_it() never changes
ship or sector owner.

diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index b4f5081550aaf38f60e283e559bca344e2614fdc..4c97d5657ff0dba579ea56fed819ac0c9b05dd50 100644 (file)
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.c
@@ -145,7 +145,7 @@ static int
 nav_loadship(struct shpstr *sp)
 {
     struct sctstr *sectp;
 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;
 
     for (i = 0; i < TMAX; i++)
        didsomething[i] = 0;


@@ -160,8 +160,6 @@ nav_loadship(struct shpstr *sp)
     if (!(sectp = getsectp(sp->shp_x, sp->shp_y)))
        return 0;               /* safety */
 
     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), sp->shp_own);
 
     /* loop through each field for that ship */
     rel = getrel(getnatp(sectp->sct_own), sp->shp_own);
 
     /* loop through each field for that ship */


@@ -173,7 +171,7 @@ nav_loadship(struct shpstr *sp)
            didsomething[i] = 1;
            continue;
        }
            didsomething[i] = 1;
            continue;
        }

-       if (landown == 0) {
+       if (sectp->sct_own == 0) {

            /* either sea or deity harbor */
            didsomething[i] = 1;
            continue;
            /* either sea or deity harbor */
            didsomething[i] = 1;
            continue;


@@ -183,7 +181,7 @@ nav_loadship(struct shpstr *sp)
            didsomething[i] = 1;
            continue;
        }
            didsomething[i] = 1;
            continue;
        }

-       if (landown == shipown || rel >= FRIENDLY)
+       if (sectp->sct_own == sp->shp_own || rel >= FRIENDLY)

            didsomething[i] = load_it(sp, sectp, i);
     }
 
            didsomething[i] = load_it(sp, sectp, i);
     }