(mchr, plchr, lchr, nchr): Move initializer to new builtin config

[empserver] / src / lib / global / file.c

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index a5e077393321c700afd6371fb7e0dcbc3d1e4909..12ea3ca4189c5e887e57184caa1dc7910be85100 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -145,18 +145,28 @@ struct empfile empfile[] = {
      UNMAPPED_CACHE(struct realmstr, EFF_OWNER)},
 
     /* Static game data (configuration) */
-    {EF_SECTOR_CHR, "sect-chr", NULL, dchr_ca, ARRAY_TABLE(dchr, EFF_CFG)},
-    {EF_SHIP_CHR, "ship-chr", NULL, mchr_ca, ARRAY_CACHE(mchr, EFF_CFG)},
-    {EF_PLANE_CHR, "plane-chr", NULL, plchr_ca, ARRAY_CACHE(plchr, EFF_CFG)},
-    {EF_LAND_CHR, "land-chr", NULL, lchr_ca, ARRAY_CACHE(lchr, EFF_CFG)},
-    {EF_NUKE_CHR, "nuke-chr", NULL, nchr_ca, ARRAY_CACHE(nchr, EFF_CFG)},
-    {EF_NEWS_CHR, "news-chr", NULL, rpt_ca, ARRAY_TABLE(rpt, EFF_CFG)},
-    {EF_ITEM, "item", NULL, ichr_ca, ARRAY_TABLE(ichr, EFF_CFG)},
+    {EF_SECTOR_CHR, "sect-chr", NULL, dchr_ca,
+     ARRAY_TABLE(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,
+     ARRAY_CACHE(plchr, EFF_CFG)},
+    {EF_LAND_CHR, "land-chr", "land.config", lchr_ca,
+     ARRAY_CACHE(lchr, EFF_CFG)},
+    {EF_NUKE_CHR, "nuke-chr", "nuke.config", nchr_ca,
+     ARRAY_CACHE(nchr, EFF_CFG)},
+    {EF_NEWS_CHR, "news-chr", NULL, rpt_ca,
+     ARRAY_TABLE(rpt, EFF_CFG)},
+    {EF_ITEM, "item", NULL, ichr_ca,
+     ARRAY_TABLE(ichr, EFF_CFG)},
     {EF_INFRASTRUCTURE, "infrastructure", NULL, intrchr_ca,
      ARRAY_TABLE(intrchr, EFF_CFG)},
-    {EF_PRODUCT, "product", NULL, pchr_ca, ARRAY_TABLE(pchr, EFF_CFG)},
-    {EF_TABLE, "table", NULL, empfile_ca, ARRAY_TABLE(empfile, EFF_CFG)},
-    {EF_META, "meta", NULL, mdchr_ca, PTR_CACHE(mdchr_ca, EFF_CFG)},
+    {EF_PRODUCT, "product", NULL, pchr_ca,
+     ARRAY_TABLE(pchr, EFF_CFG)},
+    {EF_TABLE, "table", NULL, empfile_ca,
+     ARRAY_TABLE(empfile, EFF_CFG)},
+    {EF_META, "meta", NULL, mdchr_ca,
+     PTR_CACHE(mdchr_ca, EFF_CFG)},
 
     /* Symbol tables */
 #define SYMTAB(type, name, tab) \