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

(empfile): Fix the previous revision: pretended ichr[], pchr[], dchr[]

Browse source 
and intrchr[] were still compile-time initialized.
This commit is contained in:
Markus Armbruster 2006-06-22 19:47:00 +00:00
parent 2cb2c59ac6
commit cf1c69543e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -146,11 +146,11 @@ struct empfile empfile[] = {
/* Static game data (configuration) */ /* Static game data (configuration) */
{EF_ITEM, "item", "item.config", ichr_ca, {EF_ITEM, "item", "item.config", ichr_ca,
ARRAY_TABLE(ichr, EFF_CFG)}, ARRAY_CACHE(ichr, EFF_CFG)},
{EF_PRODUCT, "product", "product.config", pchr_ca, {EF_PRODUCT, "product", "product.config", pchr_ca,
ARRAY_TABLE(pchr, EFF_CFG)}, ARRAY_CACHE(pchr, EFF_CFG)},
{EF_SECTOR_CHR, "sect-chr", "sect.config", dchr_ca, {EF_SECTOR_CHR, "sect-chr", "sect.config", dchr_ca,
ARRAY_TABLE(dchr, EFF_CFG)}, ARRAY_CACHE(dchr, EFF_CFG)},
{EF_SHIP_CHR, "ship-chr", "ship.config", mchr_ca, {EF_SHIP_CHR, "ship-chr", "ship.config", mchr_ca,
ARRAY_CACHE(mchr, EFF_CFG)}, ARRAY_CACHE(mchr, EFF_CFG)},
{EF_PLANE_CHR, "plane-chr", "plane.config", plchr_ca, {EF_PLANE_CHR, "plane-chr", "plane.config", plchr_ca,
@ -162,7 +162,7 @@ struct empfile empfile[] = {
{EF_NEWS_CHR, "news-chr", NULL, rpt_ca, {EF_NEWS_CHR, "news-chr", NULL, rpt_ca,
ARRAY_TABLE(rpt, EFF_CFG)}, ARRAY_TABLE(rpt, EFF_CFG)},
{EF_INFRASTRUCTURE, "infrastructure", "infra.config", intrchr_ca, {EF_INFRASTRUCTURE, "infrastructure", "infra.config", intrchr_ca,
ARRAY_TABLE(intrchr, EFF_CFG)}, ARRAY_CACHE(intrchr, EFF_CFG)},
{EF_TABLE, "table", NULL, empfile_ca, {EF_TABLE, "table", NULL, empfile_ca,
ARRAY_TABLE(empfile, EFF_CFG)}, ARRAY_TABLE(empfile, EFF_CFG)},
{EF_META, "meta", NULL, mdchr_ca, {EF_META, "meta", NULL, mdchr_ca,