(EF_PAGE_HEADINGS, page_headings_symbols, M_NOTUSED): New.

(empfile): Add it.
(rpt_ca): Use it.

diff --git a/include/file.h b/include/file.h
index 1906866847ea804a5f902587dc913083f70f977e..5299dac2fc728718b0b7394c8e9763da3b0458e5 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -146,6 +146,7 @@ enum {
     EF_RESOURCES,
     EF_NATION_STATUS,
     EF_SECTOR_NAVIGATION,
+    EF_PAGE_HEADINGS,
     /* Views */
     EF_COUNTRY,
     /* Number of types: */

diff --git a/include/news.h b/include/news.h
index 28ba571d3674ba0aad9993c17bd5a38c2a912e5f..3d5ecaa7a5ca54c231d77a7cef941217b3c45543 100644 (file)
--- a/include/news.h
+++ b/include/news.h
@@ -145,6 +145,7 @@ struct rptstr {
 #define N_BOARD_LAND    82
 #define        N_MAX_VERB      82
 
+#define N_NOTUSED        0
 #define N_FOR            1
 #define N_FRONT          2
 #define N_SEA            3

diff --git a/include/nsc.h b/include/nsc.h
index 7cf466a7c872e65c9740127310f811b06e55b32c..71268144b47085b7c091bf3e89ef9a921ff23862 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -238,6 +238,7 @@ extern struct symbol plague_stages[];
 extern struct symbol packing[];
 extern struct symbol resources[];
 extern struct symbol sector_navigation[];
+extern struct symbol page_headings_symbols[];
 
 /* src/lib/subs/nstr.c */
 extern int nstr_comp(struct nscstr *np, int len, int type, char *str);

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index 11809e1084fb5c7a26ff7ed1d56a66e1a676c778..93237528452607afce6e008ab69be5f8603498ea 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -191,6 +191,8 @@ struct empfile empfile[] = {
      PTR_CACHE(nation_status, EFF_CFG)},
     {EF_SECTOR_NAVIGATION, "sector-navigation", NULL, symbol_ca,
      PTR_CACHE(sector_navigation, EFF_CFG)},
+    {EF_PAGE_HEADINGS, "page-headings", NULL, symbol_ca,
+     PTR_CACHE(page_headings_symbols, EFF_CFG)},
 
     /* Views */
     {EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)},

diff --git a/src/lib/global/news.c b/src/lib/global/news.c
index e0bde95a6ea223801979abc49720f372793f9602..651fb637d0719e623219c25ff89f0b506d22c5c9 100644 (file)
--- a/src/lib/global/news.c
+++ b/src/lib/global/news.c
@@ -45,7 +45,7 @@
 #include "news.h"
 
 char *page_headings[] = {
-/* not used */ "Comics",
+/* N_NOTUSED*/ "Comics",
 /* N_FOR    */ "Foreign Affairs",
 /* N_FRONT  */ "The Front Line",
 /* N_SEA    */ "The High Seas",

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index a2807207a2d8c66bba8aa4e661bb06bbfe94e9b0..2bbb86517bfc6e33df9a62cb350789849dbd5007 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -557,7 +557,8 @@ struct castr rpt_ca[] = {
     {NSC_STRING, 0, NUM_RPTS, offsetof(struct rptstr, r_newstory), "newstory",
      EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct rptstr, r_good_will), "good_will", EF_BAD},
-    {NSC_INT, 0, 0, offsetof(struct rptstr, r_newspage), "newspage", EF_BAD},
+    {NSC_INT, 0, 0, offsetof(struct rptstr, r_newspage), "newspage",
+     EF_PAGE_HEADINGS},
     {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
 };
 
@@ -791,3 +792,19 @@ struct symbol sector_navigation[] = { /* for d_nav */
     {NAV_60, "bridge"},
     {0, NULL}
 };
+
+struct symbol page_headings_symbols[] = {
+    {N_NOTUSED, "Not Used"},
+    {N_FOR, "Foreign Affairs"},
+    {N_FRONT, "The Front Line"},
+    {N_SEA, "The High Seas"},
+    {N_SKY, "Sky Watch"},
+    {N_MISS, "Guidance Systems"},
+    {N_ARTY, "Firestorms"},
+    {N_ECON, "Business & Economics"},
+    {N_COLONY, "The Frontier"},
+    {N_HOME, "The Home Front"},
+    {N_SPY, "Espionage"},
+    {N_TELE, "Telecommunications"},
+    {0, NULL}
+};