From 89cd9b7ca0ba6d59b8a2c1f91ceb3771fd1027e1 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 18 May 2006 19:42:23 +0000 Subject: [PATCH] (EF_NATION_REJECTS, nation_rejects): New. (empfile): Add it. (nat_ca): Use it. --- include/file.h | 1 + include/nsc.h | 1 + src/lib/global/file.c | 1 + src/lib/global/nsc.c | 4 ++-- src/lib/global/symbol.c | 8 ++++++++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/file.h b/include/file.h index daeae24b..46346470 100644 --- a/include/file.h +++ b/include/file.h @@ -137,6 +137,7 @@ enum { EF_META_TYPE, EF_MISSIONS, EF_NATION_FLAGS, + EF_NATION_REJECTS, EF_NATION_RELATIONS, EF_NATION_STATUS, EF_NUKE_CHR_FLAGS, diff --git a/include/nsc.h b/include/nsc.h index 76f0f1ee..fc20d0fa 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -233,6 +233,7 @@ extern struct symbol plane_flags[]; extern struct symbol retreat_flags[]; extern struct symbol nation_status[]; extern struct symbol nation_flags[]; +extern struct symbol nation_rejects[]; extern struct symbol nation_relations[]; extern struct symbol level[]; extern struct symbol agreement_statuses[]; diff --git a/src/lib/global/file.c b/src/lib/global/file.c index 028c3fec..f60077a6 100644 --- a/src/lib/global/file.c +++ b/src/lib/global/file.c @@ -178,6 +178,7 @@ struct empfile empfile[] = { SYMTAB(EF_META_TYPE, "meta-type", meta_type), SYMTAB(EF_MISSIONS, "missions", missions), SYMTAB(EF_NATION_FLAGS, "nation-flags", nation_flags), + SYMTAB(EF_NATION_REJECTS, "nation-rejects", nation_rejects), SYMTAB(EF_NATION_RELATIONS, "nation-relationships", nation_relations), SYMTAB(EF_NATION_STATUS, "nation-status", nation_status), SYMTAB(EF_NUKE_CHR_FLAGS, "nuke-chr-flags", nuke_chr_flags), diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index 5b14ce30..85134b1d 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -500,8 +500,8 @@ struct castr nat_ca[] = { {NSC_STRINGY, 0, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD}, {NSC_HIDDEN, 0, MAXNOC, fldoff(natstr, nat_relate), "relations", EF_NATION_RELATIONS}, - {NSC_UCHAR, 0, MAXNOC, fldoff(natstr, nat_rejects), "rejects", - EF_BAD}, + {NSC_UCHAR, NSC_BITS, MAXNOC, fldoff(natstr, nat_rejects), "rejects", + EF_NATION_REJECTS}, {NSC_STRINGY, NSC_DEITY, 20, fldoff(natstr, nat_pnam), "passwd", EF_BAD}, {NSC_STRINGY, 0, 32, fldoff(natstr, nat_hostaddr), "ip", EF_BAD}, {NSC_STRINGY, 0, 512, fldoff(natstr, nat_hostname), "hostname", EF_BAD}, diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c index eb982786..5a772c45 100644 --- a/src/lib/global/symbol.c +++ b/src/lib/global/symbol.c @@ -124,6 +124,14 @@ struct symbol nation_flags[] = { {0, NULL} }; +struct symbol nation_rejects[] = { + {REJ_TELE, "telegrams"}, + {REJ_TREA, "treaties"}, + {REJ_ANNO, "announcements"}, + {REJ_LOAN, "loans"}, + {0, NULL} +}; + struct symbol nation_relations[] = { {-1, "unknown"}, {AT_WAR, "at-war"},