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

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

Browse source 
(treaty_ca): Add missing EF_TREATY_FLAGS to selectors acond, bcond.
This commit is contained in:
Markus Armbruster 2005-10-29 14:36:10 +00:00
parent e612db5cb6
commit ef48271974
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/file.h
View file

@ -111,7 +111,7 @@ struct empfile {
#define EF_LAND_CHR 18 #define EF_LAND_CHR 18
#define EF_NUKE_CHR 19 #define EF_NUKE_CHR 19
#define EF_NEWS_CHR 20 #define EF_NEWS_CHR 20
#define EF_TREATY_CHR 21 #define EF_TREATY_FLAGS 21
#define EF_ITEM 22 #define EF_ITEM 22
#define EF_INFRASTRUCTURE 23 #define EF_INFRASTRUCTURE 23
#define EF_PRODUCT 24 #define EF_PRODUCT 24

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

@ -122,7 +122,7 @@ struct empfile empfile[] = {
{EF_NEWS_CHR, "news chr", NULL, EFF_CFG, {EF_NEWS_CHR, "news chr", NULL, EFF_CFG,
sizeof(rpt[0]), NULL, NULL, NULL, sizeof(rpt[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)rpt, 0, rpt_ca}, -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, sizeof(treaty_flags[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca}, -1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca},
{EF_ITEM, "item", NULL, EFF_CFG, {EF_ITEM, "item", NULL, EFF_CFG,

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

@ -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_cna), "cna", EF_BAD},
{NSC_NATID, 0, 0, fldoff(trtstr, trt_cnb), "cnb", 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_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_acond), "acond", EF_TREATY_FLAGS},
{NSC_SHORT, 0, 0, fldoff(trtstr, trt_bcond), "bcond", EF_BAD}, {NSC_SHORT, 0, 0, fldoff(trtstr, trt_bcond), "bcond", EF_TREATY_FLAGS},
{NSC_TIME, 0, 0, fldoff(trtstr, trt_exp), "exp", EF_BAD}, {NSC_TIME, 0, 0, fldoff(trtstr, trt_exp), "exp", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD} {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
}; };