Indented with src/scripts/indent-emp.
This commit is contained in:
parent
5f263a7753
commit
9b7adfbecc
437 changed files with 52211 additions and 51052 deletions
|
|
@ -44,7 +44,7 @@
|
|||
#include "commands.h"
|
||||
#include "optlist.h"
|
||||
|
||||
static s_char code_char(long int coding, struct sctstr *sp);
|
||||
static s_char code_char(long int coding, struct sctstr *sp);
|
||||
|
||||
/*
|
||||
* survey type <sarg> ?cond
|
||||
|
|
@ -53,114 +53,115 @@ static s_char code_char(long int coding, struct sctstr *sp);
|
|||
int
|
||||
surv(void)
|
||||
{
|
||||
int nsect;
|
||||
struct nstr_sect nstr;
|
||||
int y;
|
||||
long coding;
|
||||
struct natstr *np;
|
||||
struct sctstr sect;
|
||||
struct range range;
|
||||
s_char *ptr;
|
||||
struct nscstr cond[NS_NCOND];
|
||||
int ncond;
|
||||
int i;
|
||||
s_char what[64];
|
||||
s_char buf[1024];
|
||||
s_char *str;
|
||||
/* Note this is not re-entrant anyway, so we keep the buffers
|
||||
around */
|
||||
static s_char *mapbuf = (s_char *)0;
|
||||
static s_char **map = (s_char **)0;
|
||||
int nsect;
|
||||
struct nstr_sect nstr;
|
||||
int y;
|
||||
long coding;
|
||||
struct natstr *np;
|
||||
struct sctstr sect;
|
||||
struct range range;
|
||||
s_char *ptr;
|
||||
struct nscstr cond[NS_NCOND];
|
||||
int ncond;
|
||||
int i;
|
||||
s_char what[64];
|
||||
s_char buf[1024];
|
||||
s_char *str;
|
||||
/* Note this is not re-entrant anyway, so we keep the buffers
|
||||
around */
|
||||
static s_char *mapbuf = (s_char *)0;
|
||||
static s_char **map = (s_char **)0;
|
||||
|
||||
nsect = 0;
|
||||
if ((ptr = getstarg(player->argp[1], "commodity or variable? ", buf)) == 0)
|
||||
return RET_SYN;
|
||||
if (encode(ptr, &coding, EF_SECTOR) < 0)
|
||||
return RET_SYN;
|
||||
if(player->argp[2] == (s_char *) 0) {
|
||||
if ((str = getstring("(sects)? ", buf)) == 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(&nstr, what))
|
||||
return RET_FAIL;
|
||||
}
|
||||
else
|
||||
if (!snxtsct(&nstr, str))
|
||||
return RET_SYN;
|
||||
if (!mapbuf)
|
||||
mapbuf = (s_char *)malloc((WORLD_Y*MAPWIDTH(1))*sizeof(s_char));
|
||||
if (!map) {
|
||||
map = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
|
||||
if (map && mapbuf) {
|
||||
for (i = 0; i < WORLD_Y; i++)
|
||||
map[i] = &mapbuf[MAPWIDTH(1) * i];
|
||||
} else if (map) {
|
||||
free((s_char *)map);
|
||||
map = (s_char **)0;
|
||||
}
|
||||
}
|
||||
if (!mapbuf || !map) {
|
||||
pr("Memory error, tell the deity.\n");
|
||||
logerror("malloc failed in sect\n");
|
||||
nsect = 0;
|
||||
if ((ptr =
|
||||
getstarg(player->argp[1], "commodity or variable? ", buf)) == 0)
|
||||
return RET_SYN;
|
||||
if (encode(ptr, &coding, EF_SECTOR) < 0)
|
||||
return RET_SYN;
|
||||
if (player->argp[2] == (s_char *)0) {
|
||||
if ((str = getstring("(sects)? ", buf)) == 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(&nstr, what))
|
||||
return RET_FAIL;
|
||||
} else if (!snxtsct(&nstr, str))
|
||||
return RET_SYN;
|
||||
if (!mapbuf)
|
||||
mapbuf =
|
||||
(s_char *)malloc((WORLD_Y * MAPWIDTH(1)) * sizeof(s_char));
|
||||
if (!map) {
|
||||
map = (s_char **)malloc(WORLD_Y * sizeof(s_char *));
|
||||
if (map && mapbuf) {
|
||||
for (i = 0; i < WORLD_Y; i++)
|
||||
map[i] = &mapbuf[MAPWIDTH(1) * i];
|
||||
} else if (map) {
|
||||
free((s_char *)map);
|
||||
map = (s_char **)0;
|
||||
}
|
||||
ncond = nstr.ncond;
|
||||
bcopy((s_char *)nstr.cond, (s_char *)cond, sizeof(struct nscstr) * ncond);
|
||||
nstr.ncond = 0;
|
||||
np = getnatp(player->cnum);
|
||||
xyrelrange(np, &nstr.range, &range);
|
||||
border(&range, " ", "");
|
||||
blankfill((s_char *)mapbuf, &nstr.range, 1);
|
||||
while (nxtsct(&nstr, §)) {
|
||||
if (!player->owner)
|
||||
continue;
|
||||
ptr = &map[nstr.dy][nstr.dx];
|
||||
if (nstr_exec(cond, ncond, (s_char *)§, EF_SECTOR)) {
|
||||
++nsect;
|
||||
*ptr = 0x80 | code_char(coding, §);
|
||||
} else {
|
||||
*ptr = dchr[sect.sct_type].d_mnem;
|
||||
}
|
||||
}
|
||||
if (!mapbuf || !map) {
|
||||
pr("Memory error, tell the deity.\n");
|
||||
logerror("malloc failed in sect\n");
|
||||
return RET_FAIL;
|
||||
}
|
||||
ncond = nstr.ncond;
|
||||
bcopy((s_char *)nstr.cond, (s_char *)cond,
|
||||
sizeof(struct nscstr) * ncond);
|
||||
nstr.ncond = 0;
|
||||
np = getnatp(player->cnum);
|
||||
xyrelrange(np, &nstr.range, &range);
|
||||
border(&range, " ", "");
|
||||
blankfill((s_char *)mapbuf, &nstr.range, 1);
|
||||
while (nxtsct(&nstr, §)) {
|
||||
if (!player->owner)
|
||||
continue;
|
||||
ptr = &map[nstr.dy][nstr.dx];
|
||||
if (nstr_exec(cond, ncond, (s_char *)§, EF_SECTOR)) {
|
||||
++nsect;
|
||||
*ptr = 0x80 | code_char(coding, §);
|
||||
} else {
|
||||
*ptr = dchr[sect.sct_type].d_mnem;
|
||||
}
|
||||
for (y=nstr.range.ly, i=0; i < nstr.range.height; y++, i++) {
|
||||
int yval;
|
||||
}
|
||||
for (y = nstr.range.ly, i = 0; i < nstr.range.height; y++, i++) {
|
||||
int yval;
|
||||
|
||||
yval = yrel(np, y);
|
||||
pr("%4d %s %4d\n", yval, map[i], yval);
|
||||
if (y >= WORLD_Y)
|
||||
y -= WORLD_Y;
|
||||
}
|
||||
border(&range, " ", "");
|
||||
if (nsect > 0)
|
||||
pr("\n%d sector%s.\n", nsect, splur(nsect));
|
||||
return RET_OK;
|
||||
yval = yrel(np, y);
|
||||
pr("%4d %s %4d\n", yval, map[i], yval);
|
||||
if (y >= WORLD_Y)
|
||||
y -= WORLD_Y;
|
||||
}
|
||||
border(&range, " ", "");
|
||||
if (nsect > 0)
|
||||
pr("\n%d sector%s.\n", nsect, splur(nsect));
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
static
|
||||
s_char
|
||||
s_char
|
||||
code_char(long int coding, struct sctstr *sp)
|
||||
{
|
||||
int amt;
|
||||
int n;
|
||||
int amt;
|
||||
int n;
|
||||
|
||||
if (!(coding & NSC_VAR))
|
||||
coding |= NSC_OFF;
|
||||
amt = decode(player->cnum, coding, (s_char *) sp, EF_SECTOR);
|
||||
if (!(coding & NSC_VAR))
|
||||
coding |= NSC_OFF;
|
||||
amt = decode(player->cnum, coding, (s_char *)sp, EF_SECTOR);
|
||||
n = 0;
|
||||
if ((coding & NSC_CMASK) == NSC_VAR) {
|
||||
if (amt != 0)
|
||||
n = (amt / 100) + 1;
|
||||
} else if (amt != 0)
|
||||
n = (amt / 10) + 1;
|
||||
if (n > 11)
|
||||
n = 11;
|
||||
if (n < 0)
|
||||
n = 0;
|
||||
if ((coding & NSC_CMASK) == NSC_VAR) {
|
||||
if (amt != 0)
|
||||
n = (amt / 100) + 1;
|
||||
} else if (amt != 0)
|
||||
n = (amt / 10) + 1;
|
||||
if (n > 11)
|
||||
n = 11;
|
||||
if (n < 0)
|
||||
n = 0;
|
||||
return " 0123456789$"[n];
|
||||
return " 0123456789$"[n];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue