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

(EF_RESOURCES, resources): New.

Browse source 
(empfile): Add it.
(pchr_ca): Use it.
This commit is contained in:
Markus Armbruster 2005-12-31 10:29:32 +00:00
parent 747fb90407
commit 028a1bf3d8
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/file.h
View file

@ -141,7 +141,8 @@ struct empfile {
#define EF_AGREEMENT_STATUS 39 #define EF_AGREEMENT_STATUS 39
#define EF_PLAGUE_STAGES 40 #define EF_PLAGUE_STAGES 40
#define EF_PACKING 41 #define EF_PACKING 41
#define EF_MAX 42 #define EF_RESOURCES 42
#define EF_MAX 43
#define EF_IS_GAME_STATE(type) (EF_SECTOR <= (type) && (type) <= EF_LOST) #define EF_IS_GAME_STATE(type) (EF_SECTOR <= (type) && (type) <= EF_LOST)

1
include/nsc.h
View file

@ -233,6 +233,7 @@ extern struct symbol level[];
extern struct symbol agreement_statuses[]; extern struct symbol agreement_statuses[];
extern struct symbol plague_stages[]; extern struct symbol plague_stages[];
extern struct symbol packing[]; extern struct symbol packing[];
extern struct symbol resources[];
/* src/lib/subs/nstr.c */ /* src/lib/subs/nstr.c */
extern int nstr_comp(struct nscstr *np, int len, int type, char *str); extern int nstr_comp(struct nscstr *np, int len, int type, char *str);

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

@ -169,8 +169,7 @@ struct empfile empfile[] = {
PTR_CACHE(meta_type, EFF_CFG)}, PTR_CACHE(meta_type, EFF_CFG)},
{EF_META_FLAGS, "meta-flags", NULL, symbol_ca, {EF_META_FLAGS, "meta-flags", NULL, symbol_ca,
PTR_CACHE(meta_flags, EFF_CFG)}, PTR_CACHE(meta_flags, EFF_CFG)},
{EF_MISSIONS, "missions", NULL, symbol_ca, {EF_MISSIONS, "missions", NULL, symbol_ca, PTR_CACHE(missions, EFF_CFG)},
PTR_CACHE(missions, EFF_CFG)},
{EF_PLANE_FLAGS, "plane-flags", NULL, symbol_ca, {EF_PLANE_FLAGS, "plane-flags", NULL, symbol_ca,
PTR_CACHE(plane_flags, EFF_CFG)}, PTR_CACHE(plane_flags, EFF_CFG)},
{EF_RETREAT_FLAGS, "retreat-flags", NULL, symbol_ca, {EF_RETREAT_FLAGS, "retreat-flags", NULL, symbol_ca,
@ -184,8 +183,8 @@ struct empfile empfile[] = {
PTR_CACHE(agreement_statuses, EFF_CFG)}, PTR_CACHE(agreement_statuses, EFF_CFG)},
{EF_PLAGUE_STAGES, "plague-stages", NULL, symbol_ca, {EF_PLAGUE_STAGES, "plague-stages", NULL, symbol_ca,
PTR_CACHE(plague_stages, EFF_CFG)}, PTR_CACHE(plague_stages, EFF_CFG)},
{EF_PACKING, "packing", NULL, symbol_ca, {EF_PACKING, "packing", NULL, symbol_ca, PTR_CACHE(packing, EFF_CFG)},
PTR_CACHE(packing, EFF_CFG)}, {EF_RESOURCES, "resources", NULL, symbol_ca, PTR_CACHE(resources, EFF_CFG)},
/* Sentinel */ /* Sentinel */
{EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL}, {EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},

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

@ -106,7 +106,7 @@ struct castr pchr_ca[] = {
EF_ITEM}, EF_ITEM},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_level), "level", EF_LEVEL}, {NSC_INT, 0, 0, offsetof(struct pchrstr, p_level), "level", EF_LEVEL},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_cost), "cost", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct pchrstr, p_cost), "cost", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrndx), "nrndx", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrndx), "nrndx", EF_RESOURCES},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrdep), "nrdep", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrdep), "nrdep", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlndx), "nlndx", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlndx), "nlndx", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlmin), "nlmin", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlmin), "nlmin", EF_BAD},
@ -748,3 +748,14 @@ struct symbol packing[] = {
{BPKG, "bank"}, {BPKG, "bank"},
{0, NULL} {0, NULL}
}; };
struct symbol resources[] = {
/* names should match resource selector names in sect_ca[] */
{0, "none"},
{offsetof(struct sctstr, sct_min), "min"},
{offsetof(struct sctstr, sct_gmin), "gold"},
{offsetof(struct sctstr, sct_fertil), "fert"},
{offsetof(struct sctstr, sct_oil), "ocontent"},
{offsetof(struct sctstr, sct_uran), "uran"},
{0, NULL}
};