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

(map, rout, sct, surv): Remove special case for sects argument `*',

Browse source 
snxtsct() handles it just fine.
This commit is contained in:
Markus Armbruster 2006-03-27 19:45:08 +00:00
parent f99bc9298a
commit 523936cfef
4 changed files with 5 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib/commands/rout.c
View file

@ -62,8 +62,6 @@ rout(void)
i_type i_del;
int dir;
s_char *p;
s_char what[64];
s_char *str;
s_char buf1[1024];
/* Note this is not re-entrant anyway, so we keep the buffers
around */
@ -75,19 +73,7 @@ rout(void)
if ((ip = whatitem(player->argp[1], "What item? ")) == 0)
return RET_SYN;
i_del = ip->i_uid;;
if (player->argp[2] == NULL) {
if ((str = getstring("(sects)? ", buf1)) == 0)
return RET_SYN;
} else {
str = player->argp[2];
}
if (*str == '*') {
sprintf(what, "%d:%d,%d:%d",
-WORLD_X / 2, WORLD_X / 2 - 1,
-WORLD_Y / 2, WORLD_Y / 2 - 1);
if (!snxtsct(&ns, what))
return RET_FAIL;
} else if (!snxtsct(&ns, str))
if (!snxtsct(&ns, player->argp[2]))
return RET_FAIL;
if (!mapbuf)
mapbuf = malloc(WORLD_Y * MAPWIDTH(3));