diff --git a/include/file.h b/include/file.h index 753408d9..d7a10357 100644 --- a/include/file.h +++ b/include/file.h @@ -132,7 +132,7 @@ struct empfile { #define EF_META 30 #define EF_META_TYPE 31 #define EF_META_FLAGS 32 -#define EF_MISSION_FLAGS 33 +#define EF_MISSIONS 33 #define EF_PLANE_FLAGS 34 #define EF_RETREAT_FLAGS 35 #define EF_NATION_FLAGS 36 diff --git a/include/nsc.h b/include/nsc.h index e77c4b35..090f9fd3 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -224,7 +224,7 @@ extern struct symbol treaty_flags[]; extern struct castr mdchr_ca[]; extern struct symbol meta_type[]; extern struct symbol meta_flags[]; -extern struct symbol mission_flags[]; +extern struct symbol missions[]; extern struct symbol plane_flags[]; extern struct symbol retreat_flags[]; extern struct symbol nation_flags[]; diff --git a/src/lib/global/file.c b/src/lib/global/file.c index 892cba27..67dfe0ce 100644 --- a/src/lib/global/file.c +++ b/src/lib/global/file.c @@ -163,8 +163,8 @@ struct empfile empfile[] = { PTR_CACHE(meta_type, EFF_CFG)}, {EF_META_FLAGS, "meta flags", NULL, symbol_ca, PTR_CACHE(meta_flags, EFF_CFG)}, - {EF_MISSION_FLAGS, "mission flags", NULL, symbol_ca, - PTR_CACHE(mission_flags, EFF_CFG)}, + {EF_MISSIONS, "missions", NULL, symbol_ca, + PTR_CACHE(missions, EFF_CFG)}, {EF_PLANE_FLAGS, "plane flags", NULL, symbol_ca, PTR_CACHE(plane_flags, EFF_CFG)}, {EF_RETREAT_FLAGS, "retreat flags", NULL, symbol_ca, diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index 86bfef13..40d8abf7 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -185,7 +185,7 @@ struct castr dchr_ca[] = { { NSC_CHAR, NSC_EXTRA, 0, fldoff(genitem, group), "group", EF_BAD}, \ { NSC_XCOORD, 0, 0, fldoff(genitem, opx), "opx", 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} struct castr ship_ca[] = { @@ -643,7 +643,7 @@ struct symbol meta_type[] = { {NSC_NOTYPE, NULL} }; -struct symbol mission_flags[] = { +struct symbol missions[] = { {MI_INTERDICT, "interdiction"}, {MI_SUPPORT, "support"}, {MI_RESERVE, "reserve"},