int
snxtsct(register struct nstr_sect *np, s_char *str)
{
- register s_char *cp;
- struct range range;
- coord cx, cy;
- int dist;
- s_char buf[1024];
- struct range wr;
+ register s_char *cp;
+ struct range range;
+ coord cx, cy;
+ int dist;
+ s_char buf[1024];
+ struct range wr;
- if (str == 0 || *str == 0) {
- if ((str = getstring("(sects)? ", buf)) == 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)) {
- case NS_AREA:
- if (!sarg_area(str, &range))
- return 0;
- snxtsct_area(np, &range);
- break;
- case NS_DIST:
- if (!sarg_range(str, &cx, &cy, &dist))
- return 0;
- snxtsct_dist(np, cx, cy, dist);
- break;
- case NS_ALL:
- /* fake "all" by doing a world-sized area query */
- snxtsct_area(np, &wr);
- break;
- default:
- return 0;
- }
- if (player->condarg == 0)
- return 1;
- cp = player->condarg;
- while ((cp = nstr_comp(np->cond, &np->ncond, EF_SECTOR, cp)) && *cp)
- ;
- if (cp == 0)
- return 0;
+ if (str == 0 || *str == 0) {
+ if ((str = getstring("(sects)? ", buf)) == 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)) {
+ case NS_AREA:
+ if (!sarg_area(str, &range))
+ return 0;
+ snxtsct_area(np, &range);
+ break;
+ case NS_DIST:
+ if (!sarg_range(str, &cx, &cy, &dist))
+ return 0;
+ snxtsct_dist(np, cx, cy, dist);
+ break;
+ case NS_ALL:
+ /* fake "all" by doing a world-sized area query */
+ snxtsct_area(np, &wr);
+ break;
+ default:
+ return 0;
+ }
+ if (player->condarg == 0)
return 1;
+ cp = player->condarg;
+ while ((cp = nstr_comp(np->cond, &np->ncond, EF_SECTOR, cp)) && *cp) ;
+ if (cp == 0)
+ return 0;
+ return 1;
}
+
/*
* The rest of these (snxtsct_all, snxtsct_area, etc, have been moved
* into the common lib, since they don't use condargs, and are useful