Fix xdump realm to dump player instead of absolute coordinates

Disclosed the true origin.  Broken in 45adbdb0, v4.3.0.

diff --git a/include/nat.h b/include/nat.h
index 58b8067fcedab35b219d1b8803735876236fdaa9..4272c99535361b52dfc57275893d666c0b8621d8 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -75,8 +75,8 @@ struct realmstr {
     natid r_cnum;              /* country number */
     /* end of part matching struct empobj */
     unsigned short r_realm;    /* realm number */
-    short r_xl, r_xh;          /* horizontal bounds */
-    short r_yl, r_yh;          /* vertical bounds */
+    coord r_xl, r_xh;          /* horizontal bounds */
+    coord r_yl, r_yh;          /* vertical bounds */
 };
 
 struct natstr {

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 86b6dc649d2ca9ff3ffe156ab4737f6cecf82887..f01207e0ccc027cd17ed7e347524b38a319f6674 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -600,10 +600,10 @@ struct castr realm_ca[] = {
      EF_BAD, NSC_EXTRA},
     {"cnum", fldoff(r_cnum), NSC_NATID, 0, NULL, EF_NATION, NSC_CONST},
     {"realm", fldoff(r_realm), NSC_USHORT, 0, NULL, EF_BAD, NSC_CONST},
-    {"xl", fldoff(r_xl), NSC_SHORT, 0, NULL, EF_BAD, 0},
-    {"xh", fldoff(r_xh), NSC_SHORT, 0, NULL, EF_BAD, 0},
-    {"yl", fldoff(r_yl), NSC_SHORT, 0, NULL, EF_BAD, 0},
-    {"yh", fldoff(r_yh), NSC_SHORT, 0, NULL, EF_BAD, 0},
+    {"xl", fldoff(r_xl), NSC_XCOORD, 0, NULL, EF_BAD, 0},
+    {"xh", fldoff(r_xh), NSC_XCOORD, 0, NULL, EF_BAD, 0},
+    {"yl", fldoff(r_yl), NSC_YCOORD, 0, NULL, EF_BAD, 0},
+    {"yh", fldoff(r_yh), NSC_YCOORD, 0, NULL, EF_BAD, 0},
     {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
 #undef CURSTR
 };