empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(EF_NATION_REJECTS, nation_rejects): New.

Browse source 
(empfile): Add it.
(nat_ca): Use it.
This commit is contained in:
Markus Armbruster 2006-05-18 19:42:23 +00:00
parent 35d14c3e73
commit 89cd9b7ca0
5 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/file.h
View file

@ -137,6 +137,7 @@ enum {
EF_META_TYPE, EF_META_TYPE,
EF_MISSIONS, EF_MISSIONS,
EF_NATION_FLAGS, EF_NATION_FLAGS,
EF_NATION_REJECTS,
EF_NATION_RELATIONS, EF_NATION_RELATIONS,
EF_NATION_STATUS, EF_NATION_STATUS,
EF_NUKE_CHR_FLAGS, EF_NUKE_CHR_FLAGS,

1
include/nsc.h
View file

@ -233,6 +233,7 @@ extern struct symbol plane_flags[];
extern struct symbol retreat_flags[]; extern struct symbol retreat_flags[];
extern struct symbol nation_status[]; extern struct symbol nation_status[];
extern struct symbol nation_flags[]; extern struct symbol nation_flags[];
extern struct symbol nation_rejects[];
extern struct symbol nation_relations[]; extern struct symbol nation_relations[];
extern struct symbol level[]; extern struct symbol level[];
extern struct symbol agreement_statuses[]; extern struct symbol agreement_statuses[];

1
src/lib/global/file.c
View file

@ -178,6 +178,7 @@ struct empfile empfile[] = {
SYMTAB(EF_META_TYPE, "meta-type", meta_type), SYMTAB(EF_META_TYPE, "meta-type", meta_type),
SYMTAB(EF_MISSIONS, "missions", missions), SYMTAB(EF_MISSIONS, "missions", missions),
SYMTAB(EF_NATION_FLAGS, "nation-flags", nation_flags), 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_RELATIONS, "nation-relationships", nation_relations),
SYMTAB(EF_NATION_STATUS, "nation-status", nation_status), SYMTAB(EF_NATION_STATUS, "nation-status", nation_status),
SYMTAB(EF_NUKE_CHR_FLAGS, "nuke-chr-flags", nuke_chr_flags), SYMTAB(EF_NUKE_CHR_FLAGS, "nuke-chr-flags", nuke_chr_flags),

4
src/lib/global/nsc.c
View file

@ -500,8 +500,8 @@ struct castr nat_ca[] = {
{NSC_STRINGY, 0, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD}, {NSC_STRINGY, 0, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD},
{NSC_HIDDEN, 0, MAXNOC, fldoff(natstr, nat_relate), "relations", {NSC_HIDDEN, 0, MAXNOC, fldoff(natstr, nat_relate), "relations",
EF_NATION_RELATIONS}, EF_NATION_RELATIONS},
{NSC_UCHAR, 0, MAXNOC, fldoff(natstr, nat_rejects), "rejects", {NSC_UCHAR, NSC_BITS, MAXNOC, fldoff(natstr, nat_rejects), "rejects",
EF_BAD}, EF_NATION_REJECTS},
{NSC_STRINGY, NSC_DEITY, 20, fldoff(natstr, nat_pnam), "passwd", EF_BAD}, {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, 32, fldoff(natstr, nat_hostaddr), "ip", EF_BAD},
{NSC_STRINGY, 0, 512, fldoff(natstr, nat_hostname), "hostname", EF_BAD}, {NSC_STRINGY, 0, 512, fldoff(natstr, nat_hostname), "hostname", EF_BAD},

8
src/lib/global/symbol.c
View file

@ -124,6 +124,14 @@ struct symbol nation_flags[] = {
{0, NULL} {0, NULL}
}; };
struct symbol nation_rejects[] = {
{REJ_TELE, "telegrams"},
{REJ_TREA, "treaties"},
{REJ_ANNO, "announcements"},
{REJ_LOAN, "loans"},
{0, NULL}
};
struct symbol nation_relations[] = { struct symbol nation_relations[] = {
{-1, "unknown"}, {-1, "unknown"},
{AT_WAR, "at-war"}, {AT_WAR, "at-war"},