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

(real): Support argument #' in addition to <NUMBER>' and

Browse source 
`#<NUMBER>'.
This commit is contained in:
Markus Armbruster 2004-08-17 17:12:44 +00:00
parent 91c316afaa
commit 90a61e245f
1 changed files with 4 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/lib/commands/real.c
View file

@ -66,7 +66,7 @@ real(void)
int curr; int curr;
int lastr; int lastr;
struct range abs; struct range abs;
s_char *realmp = player->argp[1]; char *realmp = player->argp[1];
natp = getnatp(player->cnum); natp = getnatp(player->cnum);
if (!realmp) { if (!realmp) {
@ -75,7 +75,7 @@ real(void)
} else { } else {
if (*realmp == '#') if (*realmp == '#')
++realmp; ++realmp;
if (!isdigit(*realmp)) if (*realmp && !isdigit(*realmp))
return RET_SYN; return RET_SYN;
curr = lastr = atoi(realmp); curr = lastr = atoi(realmp);
if (curr < 0 || curr >= MAXNOR) { if (curr < 0 || curr >= MAXNOR) {
@ -83,8 +83,6 @@ real(void)
return RET_SYN; return RET_SYN;
} }
} }
abs.width = 0;
abs.height = 0;
if (player->argp[2] == 0) { if (player->argp[2] == 0) {
while (curr <= lastr) { while (curr <= lastr) {
list_realm(curr, natp); list_realm(curr, natp);
@ -93,6 +91,8 @@ real(void)
} else { } else {
if (sarg_type(player->argp[2]) != NS_AREA) if (sarg_type(player->argp[2]) != NS_AREA)
return RET_SYN; return RET_SYN;
abs.width = 0;
abs.height = 0;
if (!sarg_area(player->argp[2], &abs)) if (!sarg_area(player->argp[2], &abs))
return RET_SYN; return RET_SYN;
rp = &natp->nat_b[curr]; rp = &natp->nat_b[curr];
@ -106,45 +106,3 @@ real(void)
} }
return RET_OK; return RET_OK;
} }
/*
dreal()
{
struct natstr *natp;
int curr;
int lastr;
struct range abs;
struct range rel;
struct boundstr *b;
int nat;
s_char *rp = player->argp[1];
lastr = MAXNOR - 1;
curr = 0;
if (rp == 0) {
nat = player->cnum;
} else {
nat = atoi(rp);
if (nat < 0)
return RET_SYN;
if (nat >= MAXNOC)
return RET_SYN;
}
pr("Realms for %s (#%d)\n",cname(nat),nat);
natp = getnatp(nat);
abs.width = 0;
abs.height = 0;
while (curr <= lastr) {
b = &natp->nat_b[curr];
abs.lx = b->b_xl;
abs.hx = b->b_xh;
abs.ly = b->b_yl;
abs.hy = b->b_yh;
xyrelrange(natp, &abs, &rel);
pr("Realm #%d is %d:%d,%d:%d\n", curr,
rel.lx, rel.hx, rel.ly, rel.hy);
curr++;
}
return RET_OK;
}
*/