(EF_TREATY_CHR, EF_TREATY_FLAGS): Rename for consistency with other flags.

(treaty_ca): Add missing EF_TREATY_FLAGS to selectors acond, bcond.

diff --git a/include/file.h b/include/file.h
index 990a0f503006d94d02755f617a15c462f2438271..997abd4be749506369727ff14dd63d9ebc587a52 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -111,7 +111,7 @@ struct empfile {
 #define EF_LAND_CHR    18
 #define EF_NUKE_CHR    19
 #define EF_NEWS_CHR    20
-#define EF_TREATY_CHR  21
+#define EF_TREATY_FLAGS        21
 #define EF_ITEM                22
 #define EF_INFRASTRUCTURE   23
 #define EF_PRODUCT     24

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index b0146b0d27be851f03dc78ca6d098053396532a4..ede8593b4721b82b2da8a96ca10f21572a889256 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -122,7 +122,7 @@ struct empfile empfile[] = {
     {EF_NEWS_CHR, "news chr", NULL, EFF_CFG,
      sizeof(rpt[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)rpt, 0, rpt_ca},
-    {EF_TREATY_CHR, "treaty flags", NULL, EFF_CFG,
+    {EF_TREATY_FLAGS, "treaty flags", NULL, EFF_CFG,
      sizeof(treaty_flags[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca},
     {EF_ITEM, "item", NULL, EFF_CFG,

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 66706f47a8cd2a02ad1c3e139a998ad5f39fffd9..e212c44258b74295b3845b0875cbb86d925d16b7 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -367,8 +367,8 @@ struct castr treaty_ca[] = {
     {NSC_NATID, 0, 0, fldoff(trtstr, trt_cna), "cna", EF_BAD},
     {NSC_NATID, 0, 0, fldoff(trtstr, trt_cnb), "cnb", EF_BAD},
     {NSC_CHAR, 0, 0, fldoff(trtstr, trt_status), "status", EF_BAD},
-    {NSC_SHORT, 0, 0, fldoff(trtstr, trt_acond), "acond", EF_BAD},
-    {NSC_SHORT, 0, 0, fldoff(trtstr, trt_bcond), "bcond", EF_BAD},
+    {NSC_SHORT, 0, 0, fldoff(trtstr, trt_acond), "acond", EF_TREATY_FLAGS},
+    {NSC_SHORT, 0, 0, fldoff(trtstr, trt_bcond), "bcond", EF_TREATY_FLAGS},
     {NSC_TIME, 0, 0, fldoff(trtstr, trt_exp), "exp", EF_BAD},
     {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
 };