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

(rpt, page_headings): Declare with array size. Define without.

Browse source 
(empfile): Correctly initialize members cids, csize, fids for all
EFF_STATIC tables except EF_SHIP_CHR, EF_PLANE_CHR, EF_LAND_CHR,
EF_NUKE_CHR, EF_META and the symbol tables.
This commit is contained in:
Markus Armbruster 2005-10-29 14:48:32 +00:00
parent ef48271974
commit b96b9baced
3 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/news.h
View file

@ -164,7 +164,7 @@ struct rptstr {
#define getnewsp(n) \ #define getnewsp(n) \
(struct nwsstr *) ef_ptr(EF_NEWS, n) (struct nwsstr *) ef_ptr(EF_NEWS, n)
extern struct rptstr rpt[]; extern struct rptstr rpt[N_MAX_VERB + 2];
extern char *page_headings[]; extern char *page_headings[N_MAX_PAGE + 1];
#endif /* _NEWS_H_ */ #endif /* _NEWS_H_ */

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

@ -102,11 +102,14 @@ struct empfile empfile[] = {
sizeof(struct loststr), NULL, NULL, NULL, sizeof(struct loststr), NULL, NULL, NULL,
-1, -1, 0, 0, NULL, 0, lost_ca}, -1, -1, 0, 0, NULL, 0, lost_ca},
/* Static game data (configuation) */ /* Static game data (configuration) */
#define EFF_CFG (EFF_RDONLY | EFF_MEM | EFF_STATIC) #define EFF_CFG (EFF_RDONLY | EFF_MEM | EFF_STATIC)
{EF_SECTOR_CHR, "sect chr", NULL, EFF_CFG, #define SZ(array) (sizeof(array) / sizeof((array)[0]))
sizeof(dchr[0]), NULL, NULL, NULL, #define CFGTAB(type, name, array, ca) \
-1, -1, 0, 0, (char *)dchr, 0, dchr_ca}, {(type), (name), NULL, EFF_RDONLY | EFF_MEM | EFF_STATIC, \
sizeof((array)[0]), NULL, NULL, NULL, \
-1, 0, SZ((array)) - 1, SZ((array)), (char *)(array), SZ((array)) - 1, (ca)}
CFGTAB(EF_SECTOR_CHR, "sect chr", dchr, dchr_ca),
{EF_SHIP_CHR, "ship chr", NULL, EFF_CFG, {EF_SHIP_CHR, "ship chr", NULL, EFF_CFG,
sizeof(mchr[0]), NULL, NULL, NULL, sizeof(mchr[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)mchr, 0, mchr_ca}, -1, -1, 0, 0, (char *)mchr, 0, mchr_ca},
@ -119,24 +122,14 @@ struct empfile empfile[] = {
{EF_NUKE_CHR, "nuke chr", NULL, EFF_CFG, {EF_NUKE_CHR, "nuke chr", NULL, EFF_CFG,
sizeof(nchr[0]), NULL, NULL, NULL, sizeof(nchr[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)nchr, 0, nchr_ca}, -1, -1, 0, 0, (char *)nchr, 0, nchr_ca},
{EF_NEWS_CHR, "news chr", NULL, EFF_CFG, CFGTAB(EF_NEWS_CHR, "news chr", rpt, rpt_ca),
sizeof(rpt[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)rpt, 0, rpt_ca},
{EF_TREATY_FLAGS, "treaty flags", NULL, EFF_CFG, {EF_TREATY_FLAGS, "treaty flags", NULL, EFF_CFG,
sizeof(treaty_flags[0]), NULL, NULL, NULL, sizeof(treaty_flags[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca}, -1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca},
{EF_ITEM, "item", NULL, EFF_CFG, CFGTAB(EF_ITEM, "item", ichr, ichr_ca),
sizeof(ichr[0]), NULL, NULL, NULL, CFGTAB(EF_INFRASTRUCTURE, "infrastructure", intrchr, intrchr_ca),
-1, -1, 0, 0, (char *)ichr, 0, ichr_ca}, CFGTAB(EF_PRODUCT, "product", pchr, pchr_ca),
{EF_INFRASTRUCTURE, "infrastructure", NULL, EFF_CFG, CFGTAB(EF_TABLE, "table", empfile, empfile_ca),
sizeof(intrchr[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)intrchr, 0, intrchr_ca},
{EF_PRODUCT, "product", NULL, EFF_CFG,
sizeof(pchr[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)pchr, 0, pchr_ca},
{EF_TABLE, "table", NULL, EFF_CFG,
sizeof(empfile[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)empfile, 0, empfile_ca},
{EF_SHIP_CHR_FLAGS, "ship chr flags", NULL, EFF_CFG, {EF_SHIP_CHR_FLAGS, "ship chr flags", NULL, EFF_CFG,
sizeof(ship_chr_flags[0]), NULL, NULL, NULL, sizeof(ship_chr_flags[0]), NULL, NULL, NULL,
-1, -1, 0, 0, (char *)ship_chr_flags, 0, symbol_ca}, -1, -1, 0, 0, (char *)ship_chr_flags, 0, symbol_ca},

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

@ -41,7 +41,7 @@
#include "misc.h" #include "misc.h"
#include "news.h" #include "news.h"
char *page_headings[N_MAX_PAGE + 1] = { char *page_headings[] = {
/* not used */ "Comics", /* not used */ "Comics",
/* N_FOR */ "Foreign Affairs", /* N_FOR */ "Foreign Affairs",
/* N_FRONT */ "The Front Line", /* N_FRONT */ "The Front Line",
@ -58,7 +58,7 @@ char *page_headings[N_MAX_PAGE + 1] = {
static char no_news[] = "does nothing in particular to %s"; static char no_news[] = "does nothing in particular to %s";
struct rptstr rpt[N_MAX_VERB + 2] = { struct rptstr rpt[] = {
/* nice page text */ /* nice page text */
/* 0*/ { 0, 0, { no_news, no_news } }, /* 0*/ { 0, 0, { no_news, no_news } },
{ -4, N_FRONT, { "infantry capture %s territory", { -4, N_FRONT, { "infantry capture %s territory",