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

and intrchr[] were still compile-time initialized.

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index d3d330a5a9ae0003b0bc5299f5a37736b17c20ab..6773c42c7187b9265426c5fb3747494d5e82d422 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -146,11 +146,11 @@ struct empfile empfile[] = {
 
     /* Static game data (configuration) */
     {EF_ITEM, "item", "item.config", ichr_ca,
-     ARRAY_TABLE(ichr, EFF_CFG)},
+     ARRAY_CACHE(ichr, EFF_CFG)},
     {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,
-     ARRAY_TABLE(dchr, EFF_CFG)},
+     ARRAY_CACHE(dchr, EFF_CFG)},
     {EF_SHIP_CHR, "ship-chr", "ship.config", mchr_ca,
      ARRAY_CACHE(mchr, EFF_CFG)},
     {EF_PLANE_CHR, "plane-chr", "plane.config", plchr_ca,
@@ -162,7 +162,7 @@ struct empfile empfile[] = {
     {EF_NEWS_CHR, "news-chr", NULL, rpt_ca,
      ARRAY_TABLE(rpt, EFF_CFG)},
     {EF_INFRASTRUCTURE, "infrastructure", "infra.config", intrchr_ca,
-     ARRAY_TABLE(intrchr, EFF_CFG)},
+     ARRAY_CACHE(intrchr, EFF_CFG)},
     {EF_TABLE, "table", NULL, empfile_ca,
      ARRAY_TABLE(empfile, EFF_CFG)},
     {EF_META, "meta", NULL, mdchr_ca,