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

(EF_PAGE_HEADINGS, page_headings_symbols, M_NOTUSED): New.

Browse source 
(empfile): Add it.
(rpt_ca): Use it.
This commit is contained in:
Ron Koenderink 2006-01-29 18:40:11 +00:00
parent 1bca66c061
commit f438b74e85
6 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/file.h
View file

@ -146,6 +146,7 @@ enum {
EF_RESOURCES, EF_RESOURCES,
EF_NATION_STATUS, EF_NATION_STATUS,
EF_SECTOR_NAVIGATION, EF_SECTOR_NAVIGATION,
EF_PAGE_HEADINGS,
/* Views */ /* Views */
EF_COUNTRY, EF_COUNTRY,
/* Number of types: */ /* Number of types: */

1
include/news.h
View file

@ -145,6 +145,7 @@ struct rptstr {
#define N_BOARD_LAND 82 #define N_BOARD_LAND 82
#define N_MAX_VERB 82 #define N_MAX_VERB 82
#define N_NOTUSED 0
#define N_FOR 1 #define N_FOR 1
#define N_FRONT 2 #define N_FRONT 2
#define N_SEA 3 #define N_SEA 3

1
include/nsc.h
View file

@ -238,6 +238,7 @@ extern struct symbol plague_stages[];
extern struct symbol packing[]; extern struct symbol packing[];
extern struct symbol resources[]; extern struct symbol resources[];
extern struct symbol sector_navigation[]; extern struct symbol sector_navigation[];
extern struct symbol page_headings_symbols[];
/* src/lib/subs/nstr.c */ /* src/lib/subs/nstr.c */
extern int nstr_comp(struct nscstr *np, int len, int type, char *str); extern int nstr_comp(struct nscstr *np, int len, int type, char *str);

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

@ -191,6 +191,8 @@ struct empfile empfile[] = {
PTR_CACHE(nation_status, EFF_CFG)}, PTR_CACHE(nation_status, EFF_CFG)},
{EF_SECTOR_NAVIGATION, "sector-navigation", NULL, symbol_ca, {EF_SECTOR_NAVIGATION, "sector-navigation", NULL, symbol_ca,
PTR_CACHE(sector_navigation, EFF_CFG)}, PTR_CACHE(sector_navigation, EFF_CFG)},
{EF_PAGE_HEADINGS, "page-headings", NULL, symbol_ca,
PTR_CACHE(page_headings_symbols, EFF_CFG)},
/* Views */ /* Views */
{EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)}, {EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)},

2
src/lib/global/news.c
View file

@ -45,7 +45,7 @@
#include "news.h" #include "news.h"
char *page_headings[] = { char *page_headings[] = {
/* not used */ "Comics", /* N_NOTUSED*/ "Comics",
/* N_FOR */ "Foreign Affairs", /* N_FOR */ "Foreign Affairs",
/* N_FRONT */ "The Front Line", /* N_FRONT */ "The Front Line",
/* N_SEA */ "The High Seas", /* N_SEA */ "The High Seas",

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

@ -557,7 +557,8 @@ struct castr rpt_ca[] = {
{NSC_STRING, 0, NUM_RPTS, offsetof(struct rptstr, r_newstory), "newstory", {NSC_STRING, 0, NUM_RPTS, offsetof(struct rptstr, r_newstory), "newstory",
EF_BAD}, EF_BAD},
{NSC_INT, 0, 0, offsetof(struct rptstr, r_good_will), "good_will", 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} {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
}; };
@ -791,3 +792,19 @@ struct symbol sector_navigation[] = { /* for d_nav */
{NAV_60, "bridge"}, {NAV_60, "bridge"},
{0, NULL} {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}
};