From 723cc96d9c6ad31f94881c75884a5e659a7398ef Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 30 Jan 2011 17:08:00 +0100 Subject: [PATCH] Eliminate nav_loadship() variables landown, shipown Code is clearer without them. Works because load_it() never changes ship or sector owner. --- src/lib/update/nav_ship.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c index b4f508155..4c97d5657 100644 --- 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; - int i, landown, shipown, didsomething[TMAX], rel; + int i, didsomething[TMAX], rel; 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 */ - landown = sectp->sct_own; - shipown = sp->shp_own; 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; } - if (landown == 0) { + if (sectp->sct_own == 0) { /* either sea or deity harbor */ didsomething[i] = 1; continue; @@ -183,7 +181,7 @@ nav_loadship(struct shpstr *sp) 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); } -- 2.43.0