From 9b33a4c59824a249ee6f04a94045bcb1f93f4f77 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 28 Dec 2014 21:34:18 +0100 Subject: [PATCH] subs: Add unitsatxy() parameter only_count Like shipsatxy(). To be used shortly. Signed-off-by: Markus Armbruster --- include/prototypes.h | 2 +- src/lib/commands/bomb.c | 6 +++--- src/lib/subs/list.c | 16 +++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/prototypes.h b/include/prototypes.h index c1c0a7604..a72d3b6f2 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -448,7 +448,7 @@ extern int roundrange(double); /* list.c */ extern int shipsatxy(coord, coord, int, int, int); extern int carriersatxy(coord, coord, natid); -extern int unitsatxy(coord, coord, int, int); +extern int unitsatxy(coord, coord, int, int, int); extern int planesatxy(coord, coord, int, int); extern int asw_shipsatxy(coord, coord, int, int, struct plnstr *, struct shiplist **); diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c index 025c366bf..cc7feafaf 100644 --- a/src/lib/commands/bomb.c +++ b/src/lib/commands/bomb.c @@ -196,7 +196,7 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target) pr("Some subs are present in the sector.\n"); } nplanes = planesatxy(target->sct_x, target->sct_y, 0, 0); - nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0); + nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0, 0); retry: p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ", buf); @@ -612,7 +612,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target) plp = (struct plist *)qp; if (changed_plane_aborts(plp)) continue; - nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0); + nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0, 0); if (nunits == 0) { pr("%s could not find any units!\n", prplane(&plp->plane)); continue; @@ -628,7 +628,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target) if (*q == '~') break; if (*q == '?') { - unitsatxy(target->sct_x, target->sct_y, 0, 0); + unitsatxy(target->sct_x, target->sct_y, 0, 0, 0); continue; } n = atoi(q); diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c index e9f523719..32c6f8131 100644 --- a/src/lib/subs/list.c +++ b/src/lib/subs/list.c @@ -28,7 +28,7 @@ * * Known contributors to this file: * Dave Pare, 1986 - * Markus Armbruster, 2003-2012 + * Markus Armbruster, 2003-2014 */ #include @@ -119,7 +119,7 @@ carriersatxy(coord x, coord y, natid own) } int -unitsatxy(coord x, coord y, int wantflags, int nowantflags) +unitsatxy(coord x, coord y, int wantflags, int nowantflags, int only_count) { int first; int units; @@ -152,12 +152,14 @@ unitsatxy(coord x, coord y, int wantflags, int nowantflags) continue; } - if (first) { - pr(" # owner eff type\n"); - first = 0; + if (!only_count) { + if (first) { + pr(" # owner eff type\n"); + first = 0; + } + pr("(#%3d) %10.10s %12.12s %s\n", ni.cur, + cname(land.lnd_own), effadv(land.lnd_effic), prland(&land)); } - pr("(#%3d) %10.10s %12.12s %s\n", ni.cur, - cname(land.lnd_own), effadv(land.lnd_effic), prland(&land)); units++; } return units; -- 2.43.0