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

(empfile,mission_flags,ship_ca,land_ca,plane_ca): Add mission flags table.

Browse source
This commit is contained in:
Ron Koenderink 2005-11-06 13:43:09 +00:00
parent bee3f4aa88
commit 23f134aa75
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/file.h
View file

@ -132,7 +132,8 @@ struct empfile {
#define EF_META 30 #define EF_META 30
#define EF_META_TYPE 31 #define EF_META_TYPE 31
#define EF_META_FLAGS 32 #define EF_META_FLAGS 32
#define EF_MAX 33 #define EF_MISSION_FLAGS 33
#define EF_MAX 34
#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

@ -224,6 +224,7 @@ extern struct symbol treaty_flags[];
extern struct castr mdchr_ca[]; extern struct castr mdchr_ca[];
extern struct symbol meta_type[]; extern struct symbol meta_type[];
extern struct symbol meta_flags[]; extern struct symbol meta_flags[];
extern struct symbol mission_flags[];
/* 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);

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

@ -163,6 +163,8 @@ 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_MISSION_FLAGS, "mission flags", NULL, symbol_ca,
PTR_CACHE(mission_flags, 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},

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

@ -52,6 +52,7 @@
#include "lost.h" #include "lost.h"
#include "product.h" #include "product.h"
#include "file.h" #include "file.h"
#include "mission.h"
#define fldoff(str, fld) offsetof(struct str, fld) #define fldoff(str, fld) offsetof(struct str, fld)
@ -184,7 +185,7 @@ struct castr dchr_ca[] = {
{ NSC_CHAR, NSC_EXTRA, 0, fldoff(genitem, group), "group", EF_BAD}, \ { NSC_CHAR, NSC_EXTRA, 0, fldoff(genitem, group), "group", EF_BAD}, \
{ NSC_XCOORD, 0, 0, fldoff(genitem, opx), "opx", EF_BAD}, \ { NSC_XCOORD, 0, 0, fldoff(genitem, opx), "opx", EF_BAD}, \
{ NSC_YCOORD, 0, 0, fldoff(genitem, opy), "opy", EF_BAD}, \ { NSC_YCOORD, 0, 0, fldoff(genitem, opy), "opy", EF_BAD}, \
{ NSC_SHORT, 0, 0, fldoff(genitem, mission), "mission", EF_BAD}, \ { NSC_SHORT, 0, 0, fldoff(genitem, mission), "mission", EF_MISSION_FLAGS}, \
{ NSC_SHORT, 0, 0, fldoff(genitem, radius), "radius", EF_BAD} { NSC_SHORT, 0, 0, fldoff(genitem, radius), "radius", EF_BAD}
struct castr ship_ca[] = { struct castr ship_ca[] = {
@ -637,3 +638,14 @@ struct symbol meta_type[] = {
{NSC_STRINGY,"c"}, {NSC_STRINGY,"c"},
{NSC_NOTYPE, NULL} {NSC_NOTYPE, NULL}
}; };
struct symbol mission_flags[] = {
{MI_INTERDICT, "interdiction"},
{MI_SUPPORT, "support"},
{MI_RESERVE, "reserve"},
{MI_ESCORT, "escort"},
{MI_AIR_DEFENSE, "air defense"},
{MI_DSUPPORT, "defensive support"},
{MI_OSUPPORT, "offensive support"},
{0, NULL}
};