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

(STAT_ABS): Only set by files program for country #0. Prevents offset

Browse source 
and origin commands from working.  Remove.
This commit is contained in:
Markus Armbruster 2006-01-04 14:27:10 +00:00
parent 4abeea5de9
commit c13a592bf5
3 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/nat.h
View file

@ -97,7 +97,6 @@ struct natstr {
#define STAT_SANCT bit(1) /* country in sanctuary */ #define STAT_SANCT bit(1) /* country in sanctuary */
#define STAT_NORM bit(2) /* normal country */ #define STAT_NORM bit(2) /* normal country */
#define STAT_GOD bit(3) /* deity powers */ #define STAT_GOD bit(3) /* deity powers */
#define STAT_ABS bit(4) /* abs coords */
#define STAT_NEW bit(5) /* just initialized */ #define STAT_NEW bit(5) /* just initialized */
/* Update fields. */ /* Update fields. */

10
src/lib/common/xy.c
View file

@ -69,11 +69,7 @@ xrel(struct natstr *np, coord absx)
{ {
coord x; coord x;
if ((np->nat_stat & STAT_ABS) == 0) {
x = XNORM(absx - np->nat_xorg); x = XNORM(absx - np->nat_xorg);
} else {
x = XNORM(absx);
}
if (x >= WORLD_X / 2) if (x >= WORLD_X / 2)
x -= WORLD_X; x -= WORLD_X;
else if (x < -WORLD_X / 2) else if (x < -WORLD_X / 2)
@ -86,11 +82,7 @@ yrel(struct natstr *np, coord absy)
{ {
coord y; coord y;
if ((np->nat_stat & STAT_ABS) == 0) {
y = YNORM(absy - np->nat_yorg); y = YNORM(absy - np->nat_yorg);
} else {
y = YNORM(absy);
}
if (y >= WORLD_Y / 2) if (y >= WORLD_Y / 2)
y -= WORLD_Y; y -= WORLD_Y;
else if (y < -WORLD_Y / 2) else if (y < -WORLD_Y / 2)
@ -161,7 +153,6 @@ strtoy(char *str, char **end)
coord coord
xabs(struct natstr *np, coord relx) xabs(struct natstr *np, coord relx)
{ {
if ((np->nat_stat & STAT_ABS) == 0)
relx += np->nat_xorg; relx += np->nat_xorg;
return XNORM(relx); return XNORM(relx);
} }
@ -169,7 +160,6 @@ xabs(struct natstr *np, coord relx)
coord coord
yabs(struct natstr *np, coord rely) yabs(struct natstr *np, coord rely)
{ {
if ((np->nat_stat & STAT_ABS) == 0)
rely += np->nat_yorg; rely += np->nat_yorg;
return YNORM(rely); return YNORM(rely);
} }

2
src/util/files.c
View file

@ -136,7 +136,7 @@ main(int argc, char *argv[])
nat.ef_type = EF_NATION; nat.ef_type = EF_NATION;
strcpy(nat.nat_cnam, "POGO"); strcpy(nat.nat_cnam, "POGO");
strcpy(nat.nat_pnam, "peter"); strcpy(nat.nat_pnam, "peter");
nat.nat_stat = STAT_INUSE | STAT_NORM | STAT_GOD | STAT_ABS; nat.nat_stat = STAT_INUSE | STAT_NORM | STAT_GOD;
nat.nat_btu = 255; nat.nat_btu = 255;
nat.nat_money = 123456789; nat.nat_money = 123456789;
nat.nat_cnum = 0; nat.nat_cnum = 0;