From 6d014e8069fbc9509004f9852e0059be1277f60b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 30 Jan 2011 16:54:19 +0100 Subject: [PATCH] Eliminate nav_ship() variable cnum Code is clearer without it. --- src/lib/update/nav_ship.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c index c2c2605b3..b3e80b026 100644 --- a/src/lib/update/nav_ship.c +++ b/src/lib/update/nav_ship.c @@ -255,14 +255,11 @@ nav_ship(struct shpstr *sp) int dummyint; double dummydouble; int dir; - natid cnum; /* just return if no autonaving to do for this ship */ if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY)) return 0; - cnum = sp->shp_own; - /* Make a list of one ships so we can use the navi.c code */ emp_initque(&ship_list); mlp = malloc(sizeof(struct ulist)); @@ -284,7 +281,7 @@ nav_ship(struct shpstr *sp) sp->shp_destx[0], sp->shp_desty[0], sp->shp_own); if (!cp) { - wu(0, cnum, + wu(0, sp->shp_own, "%s bad path, ship put on standby\n", prship(sp)); sp->shp_autonav |= AN_STANDBY; putship(sp->shp_uid, sp); @@ -316,7 +313,7 @@ nav_ship(struct shpstr *sp) /* Try to load the ship */ if (sp->shp_autonav & AN_LOADING) { - didsomething = nav_loadship(sp, cnum); + didsomething = nav_loadship(sp, sp->shp_own); if (didsomething) quit = 1; } -- 2.43.0