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

(EF_MISSION_FLAGS, EF_MISSIONS, mission_flags, missions): Rename, as

Browse source 
these are not flags.
This commit is contained in:
Markus Armbruster 2005-11-12 17:29:11 +00:00
parent d8422caa84
commit af824c3ed1
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/file.h
View file

@ -132,7 +132,7 @@ 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_MISSION_FLAGS 33 #define EF_MISSIONS 33
#define EF_PLANE_FLAGS 34 #define EF_PLANE_FLAGS 34
#define EF_RETREAT_FLAGS 35 #define EF_RETREAT_FLAGS 35
#define EF_NATION_FLAGS 36 #define EF_NATION_FLAGS 36

2
include/nsc.h
View file

@ -224,7 +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[]; extern struct symbol missions[];
extern struct symbol plane_flags[]; extern struct symbol plane_flags[];
extern struct symbol retreat_flags[]; extern struct symbol retreat_flags[];
extern struct symbol nation_flags[]; extern struct symbol nation_flags[];

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

@ -163,8 +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, {EF_MISSIONS, "missions", NULL, symbol_ca,
PTR_CACHE(mission_flags, 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,

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

@ -185,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_MISSION_FLAGS}, \ { NSC_SHORT, 0, 0, fldoff(genitem, mission), "mission", EF_MISSIONS}, \
{ 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[] = {
@ -643,7 +643,7 @@ struct symbol meta_type[] = {
{NSC_NOTYPE, NULL} {NSC_NOTYPE, NULL}
}; };
struct symbol mission_flags[] = { struct symbol missions[] = {
{MI_INTERDICT, "interdiction"}, {MI_INTERDICT, "interdiction"},
{MI_SUPPORT, "support"}, {MI_SUPPORT, "support"},
{MI_RESERVE, "reserve"}, {MI_RESERVE, "reserve"},