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

and origin commands from working.  Remove.

diff --git a/include/nat.h b/include/nat.h
index 7723be8ab61bedee14aeb7691ff52be9b7b18eb0..612f68ecdfe0d336466351b62bcbe367410a89c7 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -97,7 +97,6 @@ struct natstr {
 #define STAT_SANCT     bit(1)  /* country in sanctuary */
 #define STAT_NORM      bit(2)  /* normal country */
 #define STAT_GOD       bit(3)  /* deity powers */
-#define STAT_ABS       bit(4)  /* abs coords */
 #define STAT_NEW       bit(5)  /* just initialized */
 
        /* Update fields. */

diff --git a/src/lib/common/xy.c b/src/lib/common/xy.c
index e0cb2174e8eb7c260461f08b6128e13e911434e9..d173566937b93962b9590f999db34a39ce7ca1cd 100644 (file)
--- a/src/lib/common/xy.c
+++ b/src/lib/common/xy.c
@@ -69,11 +69,7 @@ xrel(struct natstr *np, coord absx)
 {
     coord x;
 
-    if ((np->nat_stat & STAT_ABS) == 0) {
-       x = XNORM(absx - np->nat_xorg);
-    } else {
-       x = XNORM(absx);
-    }
+    x = XNORM(absx - np->nat_xorg);
     if (x >= WORLD_X / 2)
        x -= WORLD_X;
     else if (x < -WORLD_X / 2)
@@ -86,11 +82,7 @@ yrel(struct natstr *np, coord absy)
 {
     coord y;
 
-    if ((np->nat_stat & STAT_ABS) == 0) {
-       y = YNORM(absy - np->nat_yorg);
-    } else {
-       y = YNORM(absy);
-    }
+    y = YNORM(absy - np->nat_yorg);
     if (y >= WORLD_Y / 2)
        y -= WORLD_Y;
     else if (y < -WORLD_Y / 2)
@@ -161,16 +153,14 @@ strtoy(char *str, char **end)
 coord
 xabs(struct natstr *np, coord relx)
 {
-    if ((np->nat_stat & STAT_ABS) == 0)
-       relx += np->nat_xorg;
+    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;
+    rely += np->nat_yorg;
     return YNORM(rely);
 }
 

diff --git a/src/util/files.c b/src/util/files.c
index 78518b73f9c80fa3f867b38cd914475afb88d2b9..ee5ba43708b4a67fc319fcacac831d6e77fd8ede 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -136,7 +136,7 @@ main(int argc, char *argv[])
     nat.ef_type = EF_NATION;
     strcpy(nat.nat_cnam, "POGO");
     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_money = 123456789;
     nat.nat_cnum = 0;