From ef48271974028dc16995cc10b1a846e0ef6fe5ea Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 29 Oct 2005 14:36:10 +0000 Subject: [PATCH] (EF_TREATY_CHR, EF_TREATY_FLAGS): Rename for consistency with other flags. (treaty_ca): Add missing EF_TREATY_FLAGS to selectors acond, bcond. --- include/file.h | 2 +- src/lib/global/file.c | 2 +- src/lib/global/nsc.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/file.h b/include/file.h index 990a0f503..997abd4be 100644 --- 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 b0146b0d2..ede8593b4 100644 --- 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 66706f47a..e212c4425 100644 --- 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} }; -- 2.43.0