Fix empdump not to depend on POGO's origin

Treat NATID_BAD as deity with absolute coordinates in nstr_exec_val()
and xdinit().  Use that in dump_table().

diff --git a/src/lib/common/nstreval.c b/src/lib/common/nstreval.c
index 424efb18a68ab73ab0a7c0147684efb784615603..505407208aaede1c9ab21d6acece3ff4c52a7497 100644 (file)
--- a/src/lib/common/nstreval.c
+++ b/src/lib/common/nstreval.c
@@ -61,7 +61,8 @@ nstr_mksymval(struct valstr *val, struct castr *ca, int idx)
 /*
  * Evaluate VAL.
  * If VAL is symbolic, evaluate it into a promoted value type.
- * Use country CNUM's coordinate system and access control.
+ * Translate it for country CNUM (coordinate system and contact
+ * status), except when CNUM is NATID_BAD.
  * PTR points to a context object of the type that was used to compile
  * the value.
  * Unless WANT is NSC_NOTYPE, coerce the value to promoted value type
@@ -74,6 +75,7 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
     char *memb_ptr;
     enum nsc_type valtype;
     int idx;
+    coord c;
     struct natstr *natp;
 
     if (CANT_HAPPEN(want != NSC_NOTYPE && !NSC_IS_PROMOTED(want)))
@@ -119,20 +121,36 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
            val->val_as.lng = ((long *)memb_ptr)[idx];
            break;
        case NSC_XCOORD:
-           val->val_as.lng = xrel(getnatp(cnum), ((short *)memb_ptr)[idx]);
+           c = ((short *)memb_ptr)[idx];
+           if (cnum == NATID_BAD) {
+               /* FIXME use variant of xrel() that takes orig instead of nation */
+               if (c >= WORLD_X / 2)
+                   c -= WORLD_X;
+           } else
+               c = xrel(getnatp(cnum), c);
+           val->val_as.lng = c;
            break;
        case NSC_YCOORD:
-           val->val_as.lng = yrel(getnatp(cnum), ((short *)memb_ptr)[idx]);
+           c = ((short *)memb_ptr)[idx];
+           if (cnum == NATID_BAD) {
+               /* FIXME use variant of yrel() that takes orig instead of nation */
+               if (c >= WORLD_Y / 2)
+                   c -= WORLD_Y;
+           } else
+               c = yrel(getnatp(cnum), c);
+           val->val_as.lng = c;
            break;
        case NSC_HIDDEN:
            val->val_as.lng = -1;
            if (CANT_HAPPEN(((struct natstr *)ptr)->ef_type != EF_NATION))
                break;
-           natp = getnatp(cnum);
-           if (!opt_HIDDEN
-               || natp->nat_stat == STAT_GOD
-               || (getcontact(natp, idx) && getcontact(ptr, idx)))
-               val->val_as.lng = ((unsigned char *)memb_ptr)[idx];
+           if (!opt_HIDDEN && cnum != NATID_BAD) {
+               natp = getnatp(cnum);
+               if (natp->nat_stat != STAT_GOD
+                   && !(getcontact(natp, idx) && getcontact(ptr, idx)))
+                   break;
+           }
+           val->val_as.lng = ((unsigned char *)memb_ptr)[idx];
            break;
        case NSC_FLOAT:
            val->val_as.dbl = ((float *)memb_ptr)[idx];

diff --git a/src/lib/common/xdump.c b/src/lib/common/xdump.c
index c29c216faf8b5bc3d363987266a72bb9fbdd401a..edc1059cd637d87d1f64b06617f8e2f5de13e6f0 100644 (file)
--- a/src/lib/common/xdump.c
+++ b/src/lib/common/xdump.c
@@ -82,7 +82,8 @@
 #include "xdump.h"
 
 /*
- * Initialize XD to dump for country CNUM.
+ * Initialize XD.
+ * Translate dump for country CNUM, except when CNUM is NATID_BAD.
  * If HUMAN, dump in human-readable format.
  * Dump is to be delivered through callback PR.
  * Return XD.
@@ -91,7 +92,7 @@ struct xdstr *
 xdinit(struct xdstr *xd, natid cnum, int human, void (*pr)(char *fmt, ...))
 {
     xd->cnum = cnum;
-    xd->divine = getnatp(cnum)->nat_stat == STAT_GOD;
+    xd->divine = cnum == NATID_BAD || getnatp(cnum)->nat_stat == STAT_GOD;
     xd->human = human;
     xd->pr = pr;
     return xd;

diff --git a/src/util/empdump.c b/src/util/empdump.c
index d6fadd1c303901297b71d95bfbc7aee1d6f57969..48050cbb69031e5a71220d6a20bf15b9635b3038 100644 (file)
--- a/src/util/empdump.c
+++ b/src/util/empdump.c
@@ -40,6 +40,7 @@
 #include <unistd.h>
 #include "file.h"
 #include "optlist.h"
+#include "nat.h"
 #include "prototypes.h"
 #include "version.h"
 #include "xdump.h"
@@ -213,7 +214,7 @@ dump_table(int type, int human)
     if (!ca)
        return;
 
-    xdinit(&xd, 0, human, printf_wrapper);
+    xdinit(&xd, NATID_BAD, human, printf_wrapper);
     xdhdr(&xd, ef_nameof(type), 0);
     xdcolhdr(&xd, ca);
     for (i = 0; (p = ef_ptr(type, i)); i++) {