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

Revert "subs: Add unitsatxy() parameter only_count"

Browse source 
This reverts commit 9b33a4c598.

Parameter only_count was introduced so would_abandon() could use
unitsatxy(), but that was a flawed idea, fixed in the previous commit.
No callers passing non-zero remain, so get rid of it.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-05-14 22:13:57 +02:00
parent 7224442533
commit 08ffefab17
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/prototypes.h
View file

@ -446,7 +446,7 @@ extern int roundrange(double);
/* list.c */ /* list.c */
extern int shipsatxy(coord, coord, int, int, int); extern int shipsatxy(coord, coord, int, int, int);
extern int carriersatxy(coord, coord, natid); 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 planesatxy(coord, coord, int, int);
extern int asw_shipsatxy(coord, coord, int, int, struct plnstr *, extern int asw_shipsatxy(coord, coord, int, int, struct plnstr *,
struct shiplist **); struct shiplist **);

6
src/lib/commands/bomb.c
View file

@ -194,7 +194,7 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
pr("Some subs are present in the sector.\n"); pr("Some subs are present in the sector.\n");
} }
nplanes = planesatxy(target->sct_x, target->sct_y, 0, 0); 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: retry:
p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ", p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ",
buf); buf);
@ -599,7 +599,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
plp = (struct plist *)qp; plp = (struct plist *)qp;
if (changed_plane_aborts(plp)) if (changed_plane_aborts(plp))
continue; 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) { if (nunits == 0) {
pr("%s could not find any units!\n", prplane(&plp->plane)); pr("%s could not find any units!\n", prplane(&plp->plane));
continue; continue;
@ -615,7 +615,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
if (*q == '~') if (*q == '~')
break; break;
if (*q == '?') { if (*q == '?') {
unitsatxy(target->sct_x, target->sct_y, 0, 0, 0); unitsatxy(target->sct_x, target->sct_y, 0, 0);
continue; continue;
} }
n = atoi(q); n = atoi(q);

12
src/lib/subs/list.c
View file

@ -113,7 +113,7 @@ carriersatxy(coord x, coord y, natid own)
} }
int int
unitsatxy(coord x, coord y, int wantflags, int nowantflags, int only_count) unitsatxy(coord x, coord y, int wantflags, int nowantflags)
{ {
int units; int units;
struct nstr_item ni; struct nstr_item ni;
@ -144,12 +144,10 @@ unitsatxy(coord x, coord y, int wantflags, int nowantflags, int only_count)
continue; continue;
} }
if (!only_count) { if (!units)
if (!units) pr(" # owner eff type\n");
pr(" # owner eff type\n"); pr("(#%3d) %10.10s %12.12s %s\n", ni.cur,
pr("(#%3d) %10.10s %12.12s %s\n", ni.cur, cname(land.lnd_own), effadv(land.lnd_effic), prland(&land));
cname(land.lnd_own), effadv(land.lnd_effic), prland(&land));
}
units++; units++;
} }
return units; return units;