diff --git a/include/prototypes.h b/include/prototypes.h index bc32b069..389f3066 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -446,7 +446,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, int); +extern int unitsatxy(coord, coord, 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 a88dfe02..900283d8 100644 --- a/src/lib/commands/bomb.c +++ b/src/lib/commands/bomb.c @@ -194,7 +194,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, 0); + nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0); retry: p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ", buf); @@ -599,7 +599,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, 0); + nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0); if (nunits == 0) { pr("%s could not find any units!\n", prplane(&plp->plane)); continue; @@ -615,7 +615,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target) if (*q == '~') break; if (*q == '?') { - unitsatxy(target->sct_x, target->sct_y, 0, 0, 0); + unitsatxy(target->sct_x, target->sct_y, 0, 0); continue; } n = atoi(q); diff --git a/src/lib/subs/list.c b/src/lib/subs/list.c index b8e50dec..0cfe76d5 100644 --- a/src/lib/subs/list.c +++ b/src/lib/subs/list.c @@ -113,7 +113,7 @@ carriersatxy(coord x, coord y, natid own) } int -unitsatxy(coord x, coord y, int wantflags, int nowantflags, int only_count) +unitsatxy(coord x, coord y, int wantflags, int nowantflags) { int units; struct nstr_item ni; @@ -144,12 +144,10 @@ unitsatxy(coord x, coord y, int wantflags, int nowantflags, int only_count) continue; } - if (!only_count) { - if (!units) - pr(" # owner eff type\n"); - pr("(#%3d) %10.10s %12.12s %s\n", ni.cur, - cname(land.lnd_own), effadv(land.lnd_effic), prland(&land)); - } + if (!units) + pr(" # owner eff type\n"); + pr("(#%3d) %10.10s %12.12s %s\n", ni.cur, + cname(land.lnd_own), effadv(land.lnd_effic), prland(&land)); units++; } return units;