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

Eliminate nav_ship() variable cnum

Browse source 
Code is clearer without it.
This commit is contained in:
Markus Armbruster 2011-01-30 16:54:19 +01:00
parent 05b3e1b8d8
commit 6d014e8069
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -255,14 +255,11 @@ nav_ship(struct shpstr *sp)
int dummyint; int dummyint;
double dummydouble; double dummydouble;
int dir; int dir;
natid cnum;
/* just return if no autonaving to do for this ship */ /* just return if no autonaving to do for this ship */
if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY)) if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY))
return 0; return 0;
cnum = sp->shp_own;
/* Make a list of one ships so we can use the navi.c code */ /* Make a list of one ships so we can use the navi.c code */
emp_initque(&ship_list); emp_initque(&ship_list);
mlp = malloc(sizeof(struct ulist)); mlp = malloc(sizeof(struct ulist));
@ -284,7 +281,7 @@ nav_ship(struct shpstr *sp)
sp->shp_destx[0], sp->shp_desty[0], sp->shp_destx[0], sp->shp_desty[0],
sp->shp_own); sp->shp_own);
if (!cp) { if (!cp) {
wu(0, cnum, wu(0, sp->shp_own,
"%s bad path, ship put on standby\n", prship(sp)); "%s bad path, ship put on standby\n", prship(sp));
sp->shp_autonav |= AN_STANDBY; sp->shp_autonav |= AN_STANDBY;
putship(sp->shp_uid, sp); putship(sp->shp_uid, sp);
@ -316,7 +313,7 @@ nav_ship(struct shpstr *sp)
/* Try to load the ship */ /* Try to load the ship */
if (sp->shp_autonav & AN_LOADING) { if (sp->shp_autonav & AN_LOADING) {
didsomething = nav_loadship(sp, cnum); didsomething = nav_loadship(sp, sp->shp_own);
if (didsomething) if (didsomething)
quit = 1; quit = 1;
} }