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

subs: Inline shp_stays(), lnd_stays()

Browse source 
Most of the remaining callers need to fool around with snprintf() to
use them.  Not worthwhile anymore.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-06 14:10:23 +01:00
parent c5c6fc8a66
commit e8e6faaa65
2 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/lib/subs/shpsub.c
View file

@ -56,7 +56,6 @@
static void shp_nav_put_one(struct ulist *);
static int shp_check_one_mines(struct ulist *);
static int shp_hit_mine(struct shpstr *);
static void shp_stays(natid, char *, struct ulist *);
static struct ulist *
shp_find_capable(struct emp_qelem *list, int flags)
@ -347,16 +346,6 @@ shp_check_mines(struct emp_qelem *ship_list)
return stopping;
}
static void
shp_stays(natid actor, char *str, struct ulist *mlp)
{
mpr(actor, "%s %s & stays in %s\n",
prship(&mlp->unit.ship), str,
xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
shp_nav_put_one(mlp);
}
/*
* Return whether and why SP would be stuck in SECTP.
*/
@ -802,7 +791,6 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor)
enum shp_stuck stuck;
int stopping = 0;
double mobcost;
char dp[80];
if (CANT_HAPPEN(QEMPTY(list)))
return 1;
@ -855,19 +843,26 @@ shp_nav_one_sector(struct emp_qelem *list, int dir, natid actor)
mlp = (struct ulist *)qp;
stuck = shp_check_nav(&mlp->unit.ship, &sect);
if (stuck == SHP_STUCK_CANAL) {
sprintf(dp,
"is too large to fit into the canal system at %s",
xyas(newx, newy, actor));
shp_stays(actor, dp, mlp);
mpr(actor,
"%s is too large to fit into the canal system at %s"
" & stays in %s\n",
prship(&mlp->unit.ship), xyas(newx, newy, actor),
xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
shp_nav_put_one(mlp);
continue;
} else if (CANT_HAPPEN(stuck != SHP_STUCK_NOT)) {
sprintf(dp, "can't go to %s", xyas(newx, newy, actor));
shp_stays(actor, dp, mlp);
mpr(actor, "%s can't go to %s & stays in %s\n",
prship(&mlp->unit.ship), xyas(newx, newy, actor),
xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
shp_nav_put_one(mlp);
continue;
}
if (mlp->mobil <= 0.0) {
shp_stays(actor, "is out of mobility", mlp);
mpr(actor, "%s is out of mobility & stays in %s\n",
prship(&mlp->unit.ship),
xyas(mlp->unit.ship.shp_x, mlp->unit.ship.shp_y, actor));
shp_nav_put_one(mlp);
continue;
}
mobcost = shp_mobcost(&mlp->unit.ship);