contact: Move contact state from struct natstr to contactstr

[empserver] / src / lib / common / nsc.c

diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index 1a1adbec0b6277069b3e121419e4b33127533880..0a37460bb0adda43d36d673bd3f65ef6671f4f19 100644 (file)
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -638,9 +638,6 @@ struct castr cou_ca[] = {
      EF_BAD, 0, CA_DUMP},
     {"relations", fldoff(nat_relate), NSC_UCHAR, MAXNOC, NULL,
      EF_NATION_RELATIONS, NSC_HIDDEN, CA_DUMP_NONE},
-    /* mortals know there's contact (relations show), but not how strong */
-    {"contacts", fldoff(nat_contact), NSC_UCHAR, MAXNOC, NULL,
-     EF_BAD, NSC_DEITY, CA_DUMP_NONE},
     {"rejects", fldoff(nat_rejects), NSC_UCHAR, MAXNOC, NULL,
      EF_NATION_REJECTS, NSC_BITS, CA_DUMP_NONE},
     {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
@@ -655,6 +652,9 @@ struct castr contact_ca[] = {
     {"uid", fldoff(con_uid), NSC_INT, 0, NULL, EF_CONTACT, 0, CA_DUMP},
     {"timestamp", fldoff(con_timestamp), NSC_TIME, 0, NULL,
      EF_BAD, 0, CA_DUMP_NONE},
+    /* mortals know there's contact (relations show), but not how strong */
+    {"contacts", fldoff(con_contact), NSC_UCHAR, MAXNOC, NULL,
+     EF_BAD, NSC_DEITY, CA_DUMP},
     {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
 #undef CURSTR
 };