diff --git a/include/news.h b/include/news.h index 3d5ecaa7..545eca50 100644 --- a/include/news.h +++ b/include/news.h @@ -167,6 +167,6 @@ struct rptstr { (struct nwsstr *) ef_ptr(EF_NEWS, n) extern struct rptstr rpt[N_MAX_VERB + 2]; -extern char *page_headings[N_MAX_PAGE + 1]; +extern struct symbol page_headings[N_MAX_PAGE + 2]; #endif diff --git a/include/nsc.h b/include/nsc.h index 71268144..7cf466a7 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -238,7 +238,6 @@ 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/commands/news.c b/src/lib/commands/news.c index 75cd6831..6106a8a5 100644 --- a/src/lib/commands/news.c +++ b/src/lib/commands/news.c @@ -105,7 +105,7 @@ news(void) for (page = 1; page <= N_MAX_PAGE; page++) { if (!page_has_news[page]) continue; - pr("\n\t === %s ===\n", page_headings[page]); + pr("\n\t === %s ===\n", page_headings[page].name); snxtitem_rewind(&nstr); while (nxtitem(&nstr, &nws)) { if (rpt[(int)nws.nws_vrb].r_newspage != page) diff --git a/src/lib/global/file.c b/src/lib/global/file.c index 93237528..38842aee 100644 --- a/src/lib/global/file.c +++ b/src/lib/global/file.c @@ -192,7 +192,7 @@ struct empfile empfile[] = { {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)}, + PTR_CACHE(page_headings, 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 651fb637..a4141c12 100644 --- a/src/lib/global/news.c +++ b/src/lib/global/news.c @@ -43,20 +43,22 @@ #include "misc.h" #include "news.h" +#include "nsc.h" -char *page_headings[] = { -/* N_NOTUSED*/ "Comics", -/* 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" +struct symbol page_headings[] = { + {N_NOTUSED, "Comics"}, + {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} }; static char no_news[] = "does nothing in particular to %s"; diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index 2bbb8651..6a5b0e09 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -792,19 +792,3 @@ 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} -}; diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index b69e61b2..6cb1e5f2 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -637,7 +637,7 @@ show_news(int tlev) for (i = 1; i < N_MAX_VERB + 1; i++) { pr("%-2d %-20.20s %4d\n", rpt[i].r_uid, - page_headings[rpt[i].r_newspage], rpt[i].r_good_will); + page_headings[rpt[i].r_newspage].name, rpt[i].r_good_will); for (j = 0; j < NUM_RPTS; j++) pr(" %s\n", rpt[i].r_newstory[j]);