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

these are not flags.

diff --git a/include/file.h b/include/file.h
index 753408d94b5fcadf0eba37a6ae0b74ac3f925430..d7a10357a653d825cd79d9861822828bda0852d0 100644 (file)
--- 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 e77c4b3515ac95376d09048bc3c8fe64c5360d4e..090f9fd32cd20ca1360306cdf74ef40fe97b90ff 100644 (file)
--- 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 892cba2711b4f8dc1b7f52795a1df63d5876e5c6..67dfe0ceb6ab7b34c67f4877a488096f92b1e501 100644 (file)
--- 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 86bfef138723491cb0c074d29398afa21ac7984f..40d8abf7b862d3bfa26fa10fc84ca8becd94312c 100644 (file)
--- 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"},