From 58cc82589e0c8190db8f2819fbcfa434c003dbe9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 30 Jan 2011 17:10:43 +0100 Subject: [PATCH] Use relations_with() in nav_loadship() No functional change, because the value of rel only matters when sectp->sct_own != sp->shp_own, and then it's the same as before. The new value of rel permits simplifying sectp->sct_own == sp->shp_own || rel >= FRIENDLY to just rel >= FRIENDLY. --- src/lib/update/nav_ship.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c index 4c97d5657..7dc0c7ce4 100644 --- a/src/lib/update/nav_ship.c +++ b/src/lib/update/nav_ship.c @@ -160,7 +160,7 @@ nav_loadship(struct shpstr *sp) if (!(sectp = getsectp(sp->shp_x, sp->shp_y))) return 0; /* safety */ - rel = getrel(getnatp(sectp->sct_own), sp->shp_own); + rel = relations_with(sectp->sct_own, sp->shp_own); /* loop through each field for that ship */ for (i = 0; i < TMAX; ++i) { @@ -181,7 +181,7 @@ nav_loadship(struct shpstr *sp) didsomething[i] = 1; continue; } - if (sectp->sct_own == sp->shp_own || rel >= FRIENDLY) + if (rel >= FRIENDLY) didsomething[i] = load_it(sp, sectp, i); } -- 2.43.0