Indented with src/scripts/indent-emp.
This commit is contained in:
parent
5f263a7753
commit
9b7adfbecc
437 changed files with 52211 additions and 51052 deletions
|
@ -50,163 +50,162 @@
|
|||
s_char *
|
||||
xyas(coord x, coord y, natid country)
|
||||
{
|
||||
struct natstr *np;
|
||||
struct natstr *np;
|
||||
|
||||
np = getnatp(country);
|
||||
return prbuf("%d,%d", xrel(np, x), yrel(np, y));
|
||||
np = getnatp(country);
|
||||
return prbuf("%d,%d", xrel(np, x), yrel(np, y));
|
||||
}
|
||||
|
||||
s_char *
|
||||
ownxy(struct sctstr *sp)
|
||||
{
|
||||
return xyas(sp->sct_x, sp->sct_y, sp->sct_own);
|
||||
return xyas(sp->sct_x, sp->sct_y, sp->sct_own);
|
||||
}
|
||||
|
||||
coord
|
||||
xrel(struct natstr *np, coord absx)
|
||||
{
|
||||
coord x;
|
||||
coord x;
|
||||
|
||||
if ((np->nat_stat & STAT_ABS) == 0) {
|
||||
x = XNORM(absx - np->nat_xorg);
|
||||
} else {
|
||||
x = XNORM(absx);
|
||||
}
|
||||
if (x >= WORLD_X/2)
|
||||
x -= WORLD_X;
|
||||
else if (x < -WORLD_X/2)
|
||||
x += WORLD_X;
|
||||
return x;
|
||||
if ((np->nat_stat & STAT_ABS) == 0) {
|
||||
x = XNORM(absx - np->nat_xorg);
|
||||
} else {
|
||||
x = XNORM(absx);
|
||||
}
|
||||
if (x >= WORLD_X / 2)
|
||||
x -= WORLD_X;
|
||||
else if (x < -WORLD_X / 2)
|
||||
x += WORLD_X;
|
||||
return x;
|
||||
}
|
||||
|
||||
coord
|
||||
yrel(struct natstr *np, coord absy)
|
||||
{
|
||||
coord y;
|
||||
coord y;
|
||||
|
||||
if ((np->nat_stat & STAT_ABS) == 0) {
|
||||
y = YNORM(absy - np->nat_yorg);
|
||||
} else {
|
||||
y = YNORM(absy);
|
||||
}
|
||||
if (y >= WORLD_Y/2)
|
||||
y -= WORLD_Y;
|
||||
else if (y < -WORLD_Y/2)
|
||||
y += WORLD_Y;
|
||||
return y;
|
||||
if ((np->nat_stat & STAT_ABS) == 0) {
|
||||
y = YNORM(absy - np->nat_yorg);
|
||||
} else {
|
||||
y = YNORM(absy);
|
||||
}
|
||||
if (y >= WORLD_Y / 2)
|
||||
y -= WORLD_Y;
|
||||
else if (y < -WORLD_Y / 2)
|
||||
y += WORLD_Y;
|
||||
return y;
|
||||
}
|
||||
|
||||
void
|
||||
xyrelrange(struct natstr *np, struct range *src, struct range *dst)
|
||||
{
|
||||
dst->lx = xrel(np, src->lx);
|
||||
dst->hx = xrel(np, src->hx);
|
||||
dst->ly = yrel(np, src->ly);
|
||||
dst->hy = yrel(np, src->hy);
|
||||
dst->width = src->width;
|
||||
dst->height = src->height;
|
||||
dst->lx = xrel(np, src->lx);
|
||||
dst->hx = xrel(np, src->hx);
|
||||
dst->ly = yrel(np, src->ly);
|
||||
dst->hy = yrel(np, src->hy);
|
||||
dst->width = src->width;
|
||||
dst->height = src->height;
|
||||
}
|
||||
|
||||
void
|
||||
xyabsrange(struct natstr *np, struct range *src, struct range *dst)
|
||||
{
|
||||
dst->lx = xabs(np, src->lx);
|
||||
dst->hx = xabs(np, src->hx);
|
||||
dst->ly = yabs(np, src->ly);
|
||||
dst->hy = yabs(np, src->hy);
|
||||
dst->width = src->width;
|
||||
dst->height = src->height;
|
||||
dst->lx = xabs(np, src->lx);
|
||||
dst->hx = xabs(np, src->hx);
|
||||
dst->ly = yabs(np, src->ly);
|
||||
dst->hy = yabs(np, src->hy);
|
||||
dst->width = src->width;
|
||||
dst->height = src->height;
|
||||
}
|
||||
|
||||
void
|
||||
inputxy(coord *xp, coord *yp, natid cn)
|
||||
{
|
||||
struct natstr *np;
|
||||
struct natstr *np;
|
||||
|
||||
np = getnatp(cn);
|
||||
*xp = xabs(np, *xp);
|
||||
*yp = yabs(np, *yp);
|
||||
np = getnatp(cn);
|
||||
*xp = xabs(np, *xp);
|
||||
*yp = yabs(np, *yp);
|
||||
}
|
||||
|
||||
coord
|
||||
xabs(struct natstr *np, coord relx)
|
||||
{
|
||||
if ((np->nat_stat & STAT_ABS) == 0)
|
||||
relx += np->nat_xorg;
|
||||
return XNORM(relx);
|
||||
if ((np->nat_stat & STAT_ABS) == 0)
|
||||
relx += np->nat_xorg;
|
||||
return XNORM(relx);
|
||||
}
|
||||
|
||||
coord
|
||||
yabs(struct natstr *np, coord rely)
|
||||
{
|
||||
if ((np->nat_stat & STAT_ABS) == 0)
|
||||
rely += np->nat_yorg;
|
||||
return YNORM(rely);
|
||||
if ((np->nat_stat & STAT_ABS) == 0)
|
||||
rely += np->nat_yorg;
|
||||
return YNORM(rely);
|
||||
}
|
||||
|
||||
int
|
||||
sctoff(coord x, coord y)
|
||||
{
|
||||
if ((x + y) & 01) {
|
||||
logerror("%d,%d is an invalid sector specification!\n", x, y);
|
||||
return -1;
|
||||
}
|
||||
return (YNORM(y) * WORLD_X + XNORM(x))/2;
|
||||
if ((x + y) & 01) {
|
||||
logerror("%d,%d is an invalid sector specification!\n", x, y);
|
||||
return -1;
|
||||
}
|
||||
return (YNORM(y) * WORLD_X + XNORM(x)) / 2;
|
||||
}
|
||||
|
||||
coord
|
||||
xnorm(register coord x)
|
||||
{
|
||||
if (x < 0)
|
||||
x = WORLD_X - (-x % WORLD_X);
|
||||
return x % WORLD_X;
|
||||
if (x < 0)
|
||||
x = WORLD_X - (-x % WORLD_X);
|
||||
return x % WORLD_X;
|
||||
}
|
||||
|
||||
coord
|
||||
ynorm(register coord y)
|
||||
{
|
||||
if (y < 0)
|
||||
y = WORLD_Y - (-y % WORLD_Y);
|
||||
return y % WORLD_Y;
|
||||
if (y < 0)
|
||||
y = WORLD_Y - (-y % WORLD_Y);
|
||||
return y % WORLD_Y;
|
||||
}
|
||||
|
||||
int
|
||||
xyinrange(coord x, coord y, struct range *rp)
|
||||
{
|
||||
if (rp->lx < rp->hx) {
|
||||
/* xrange doesn't wrap */
|
||||
if (x < rp->lx || x > rp->hx)
|
||||
return 0;
|
||||
} else {
|
||||
if (x < rp->lx && x > rp->hx)
|
||||
return 0;
|
||||
}
|
||||
if (rp->ly < rp->hy) {
|
||||
/* yrange doesn't wrap */
|
||||
if (y < rp->ly || y > rp->hy)
|
||||
return 0;
|
||||
} else {
|
||||
if (y < rp->ly && y > rp->hy)
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
if (rp->lx < rp->hx) {
|
||||
/* xrange doesn't wrap */
|
||||
if (x < rp->lx || x > rp->hx)
|
||||
return 0;
|
||||
} else {
|
||||
if (x < rp->lx && x > rp->hx)
|
||||
return 0;
|
||||
}
|
||||
if (rp->ly < rp->hy) {
|
||||
/* yrange doesn't wrap */
|
||||
if (y < rp->ly || y > rp->hy)
|
||||
return 0;
|
||||
} else {
|
||||
if (y < rp->ly && y > rp->hy)
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
s_char *
|
||||
prbuf(s_char *format, ...)
|
||||
{
|
||||
static int nbuf = -1;
|
||||
static s_char buf[20][1024];
|
||||
va_list ap;
|
||||
static int nbuf = -1;
|
||||
static s_char buf[20][1024];
|
||||
va_list ap;
|
||||
|
||||
if (++nbuf > 19)
|
||||
nbuf = 0;
|
||||
if (++nbuf > 19)
|
||||
nbuf = 0;
|
||||
|
||||
va_start(ap, format);
|
||||
(void) vsprintf(buf[nbuf], format, ap);
|
||||
va_end(ap);
|
||||
va_start(ap, format);
|
||||
(void)vsprintf(buf[nbuf], format, ap);
|
||||
va_end(ap);
|
||||
|
||||
return buf[nbuf];
|
||||
return buf[nbuf];
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue