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

(snxtsct): Iteration order for `*' disclosed the real origin. Fix.

Browse source 
Mapping commands used to work around this bug, until map.c rev. 1.18,
rout.c 1.18, sct.c 1.17, surv.c 1.18 removed the work-around and thus
exposed the bug.
This commit is contained in:
Markus Armbruster 2006-04-20 19:06:50 +00:00
parent fc627c8dee
commit 3e172793bd
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/subs/snxtsct.c
View file

@ -46,25 +46,23 @@
* can select on either NS_ALL, NS_AREA, or NS_RANGE * can select on either NS_ALL, NS_AREA, or NS_RANGE
* iterate thru the "condarg" string looking * iterate thru the "condarg" string looking
* for arguments to compile into the nstr. * for arguments to compile into the nstr.
* Using this function for anything but command arguments is usually
* incorrect, because it respects conditionals. Use the snxtsct_FOO()
* instead.
*/ */
int int
snxtsct(struct nstr_sect *np, s_char *str) snxtsct(struct nstr_sect *np, char *str)
{ {
struct range range; struct range range;
struct natstr *natp;
coord cx, cy; coord cx, cy;
int dist, n; int dist, n;
s_char buf[1024]; char buf[1024];
struct range wr;
if (str == 0 || *str == 0) { if (str == 0 || *str == 0) {
if ((str = getstring("(sects)? ", buf)) == 0) if ((str = getstring("(sects)? ", buf)) == 0)
return 0; return 0;
} }
wr.lx = -WORLD_X / 2;
wr.ly = -WORLD_Y / 2;
wr.hx = WORLD_X / 2;
wr.hy = WORLD_Y / 2;
wr.width = wr.height = 0;
switch (sarg_type(str)) { switch (sarg_type(str)) {
case NS_AREA: case NS_AREA:
if (!sarg_area(str, &range)) if (!sarg_area(str, &range))
@ -77,8 +75,17 @@ snxtsct(struct nstr_sect *np, s_char *str)
snxtsct_dist(np, cx, cy, dist); snxtsct_dist(np, cx, cy, dist);
break; break;
case NS_ALL: case NS_ALL:
/* fake "all" by doing a world-sized area query */ /*
snxtsct_area(np, &wr); * Can't use snxtsct_all(), as it would disclose the real
* origin. Use a world-sized area instead.
*/
natp = getnatp(player->cnum);
range.lx = xabs(natp, -WORLD_X / 2);
range.ly = yabs(natp, -WORLD_Y / 2);
range.hx = xabs(natp, WORLD_X / 2);
range.hy = yabs(natp, WORLD_Y / 2);
range.width = range.height = 0;
snxtsct_area(np, &range);
break; break;
default: default:
return 0; return 0;