Clean up maintenance of config table sentinels

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

diff --git a/src/lib/global/file.c b/src/lib/global/file.c
index abca1ecdc87257cfb4f5cb5d0c017933e348e6bf..2cc640f6ff5a4331212dcf95167da42640b1f3c0 100644 (file)
--- a/src/lib/global/file.c
+++ b/src/lib/global/file.c
@@ -28,7 +28,7 @@
  *  file.c: Empire game data file descriptions.
  * 
  *  Known contributors to this file:
- *     Markus Armbruster, 2005-2007
+ *     Markus Armbruster, 2005-2008
  */
 
 #include <config.h>
@@ -53,6 +53,7 @@
 #include "server.h"
 #include "trade.h"
 #include "treaty.h"
+#include "version.h"
 #include "xy.h"
 
 /* Number of elements in ARRAY.  */
@@ -85,7 +86,7 @@
     SZ((array)), 0, SZ((array)) - 1, SZ((array)) - 1, -1, NULL, NULL
 
 /* Common configuration table flags */
-#define EFF_CFG (EFF_PRIVATE | EFF_MEM | EFF_STATIC)
+#define EFF_CFG (EFF_PRIVATE | EFF_MEM | EFF_STATIC | EFF_SENTINEL)
 
 struct empfile empfile[] = {
     /*
@@ -102,7 +103,8 @@ struct empfile empfile[] = {
      * that can be changed by users.
      *
      * Whatever of the above can't be done here must be done in
-     * empfile_init() or empfile_fixup().
+     * empfile_init() or empfile_fixup().  Except cadef may be set in
+     * nsc_init() instead.
      */
 
     /*
@@ -156,10 +158,11 @@ struct empfile empfile[] = {
 
     /*
      * Static game data (configuration)
-     *
-     * These are all empty tables, except for EF_NEWS_CHR and EF_META.
-     * Use read_builtin_tables() to fill them.  EF_META gets bogus
-     * size, cids and fids here.  Fixed up by empfile_init().
+     */
+    /*
+     * Characteristics tables.  Characteristics with a null file
+     * member are compiled in.  The others are empty; use
+     * read_builtin_tables() to fill them.
      */
     {EF_ITEM, "item", "item.config", ichr_ca,
      ARRAY_CACHE(ichr, EFF_CFG)},
@@ -179,17 +182,28 @@ struct empfile empfile[] = {
      ARRAY_TABLE(rpt, EFF_CFG)},
     {EF_INFRASTRUCTURE, "infrastructure", "infra.config", intrchr_ca,
      ARRAY_CACHE(intrchr, EFF_CFG)},
+    /*
+     * Update schedule table.  Use read_schedule() to fill.
+     */
     {EF_UPDATES, "updates", NULL, update_ca,
      ARRAY_TABLE(update_time, EFF_CFG)},
+    /*
+     * Special tables.  EF_META gets bogus size, cids and fids here.
+     * Fixed up by empfile_init().  EF_VERSION's cadef is set by
+     * nsc_init().
+     */
     {EF_TABLE, "table", NULL, empfile_ca,
      ARRAY_TABLE(empfile, EFF_CFG)},
+    {EF_VERSION, "version", NULL, NULL,
+     sizeof(PACKAGE_STRING), EFF_STATIC, version, 1, 0, 1, 1, -1,
+     NULL, NULL},
     {EF_META, "meta", NULL, mdchr_ca,
      PTR_CACHE(mdchr_ca, EFF_CFG)},
 
     /*
      * Symbol tables
      *
-     * These get bogus size, cids and fids here.  Fixed up by
+     * These get bogus csize, cids and fids here.  Fixed up by
      * empfile_init().
      */
 #define SYMTAB(type, name, tab) \