From 741a7e54bd9ca6d7ce099c29a9472f4ce5eadbee Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 23 Aug 2008 15:40:41 -0400 Subject: [PATCH] Fix xdump realm to dump player instead of absolute coordinates Disclosed the true origin. Broken in 45adbdb0, v4.3.0. --- include/nat.h | 4 ++-- src/lib/global/nsc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/nat.h b/include/nat.h index 58b8067f..4272c995 100644 --- 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 86b6dc64..f01207e0 100644 --- 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 };