empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Eliminate nav_loadship() variables landown, shipown

Browse source 
Code is clearer without them.  Works because load_it() never changes
ship or sector owner.
This commit is contained in:
Markus Armbruster 2011-01-30 17:08:00 +01:00
parent 4a142dd102
commit 723cc96d9c
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/update/nav_ship.c
View file

@ -145,7 +145,7 @@ static int
nav_loadship(struct shpstr *sp) nav_loadship(struct shpstr *sp)
{ {
struct sctstr *sectp; struct sctstr *sectp;
int i, landown, shipown, didsomething[TMAX], rel; int i, didsomething[TMAX], rel;
for (i = 0; i < TMAX; i++) for (i = 0; i < TMAX; i++)
didsomething[i] = 0; didsomething[i] = 0;
@ -160,8 +160,6 @@ nav_loadship(struct shpstr *sp)
if (!(sectp = getsectp(sp->shp_x, sp->shp_y))) if (!(sectp = getsectp(sp->shp_x, sp->shp_y)))
return 0; /* safety */ return 0; /* safety */
landown = sectp->sct_own;
shipown = sp->shp_own;
rel = getrel(getnatp(sectp->sct_own), sp->shp_own); rel = getrel(getnatp(sectp->sct_own), sp->shp_own);
/* loop through each field for that ship */ /* loop through each field for that ship */
@ -173,7 +171,7 @@ nav_loadship(struct shpstr *sp)
didsomething[i] = 1; didsomething[i] = 1;
continue; continue;
} }
if (landown == 0) { if (sectp->sct_own == 0) {
/* either sea or deity harbor */ /* either sea or deity harbor */
didsomething[i] = 1; didsomething[i] = 1;
continue; continue;
@ -183,7 +181,7 @@ nav_loadship(struct shpstr *sp)
didsomething[i] = 1; didsomething[i] = 1;
continue; 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);
} }