subs: Inline shp_stays(), lnd_stays()

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>

diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 268d5522caf5d9fd21f238f6b9730a937b7ac157..b182c9e7f126eb8df8cb8a75920986d6620e53e1 100644 (file)
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -54,7 +54,6 @@
 
 static void lnd_mar_put_one(struct ulist *);
 static int lnd_check_one_mines(struct ulist *, int);
-static void lnd_stays(natid, char *, struct ulist *);
 static int lnd_hit_mine(struct lndstr *);
 static int has_helpful_engineer(coord, coord, natid);
 
@@ -735,15 +734,6 @@ lnd_check_mines(struct emp_qelem *land_list)
     return stopping;
 }
 
-static void
-lnd_stays(natid actor, char *str, struct ulist *llp)
-{
-    mpr(actor, "%s %s & stays in %s\n",
-       prland(&llp->unit.land), str,
-       xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, actor));
-    lnd_mar_put_one(llp);
-}
-
 /* Return whether and why SP would be stuck in SECTP.  */
 enum lnd_stuck
 lnd_check_mar(struct lndstr *lp, struct sctstr *sectp)
@@ -1027,7 +1017,6 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
     int move;
     int stopping = 0;
     int visible;
-    char dp[80];
     int rel;
     int oldown;
 
@@ -1085,12 +1074,17 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor)
        llp = (struct ulist *)qp;
        if (rel != ALLIED
            && !(lchr[llp->unit.land.lnd_type].l_flags & L_SPY)) {
-           sprintf(dp, "can't go to %s", xyas(newx, newy, actor));
-           lnd_stays(actor, dp, llp);
+           mpr(actor, "%s can't go to %s & stays in %s\n",
+               prland(&llp->unit.land), xyas(newx, newy, actor),
+               xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, actor));
+           lnd_mar_put_one(llp);
            continue;
        }
        if (llp->mobil <= 0.0) {
-           lnd_stays(actor, "is out of mobility", llp);
+           mpr(actor, "%s is out of mobility & stays in %s\n",
+               prland(&llp->unit.land),
+               xyas(llp->unit.land.lnd_x, llp->unit.land.lnd_y, actor));
+           lnd_mar_put_one(llp);
            continue;
        }
        llp->unit.land.lnd_x = newx;

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index fb2a35aced833fe9ea6a3d2670440a5005d13c58..92813d05e6ac5825b8e660c5ad57a0bbda77982b 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -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);