(config_tables, custom_tables, read_config_tables, read_custom_tables)

(read_config_table_file, read_custom_table_file): Rename.

diff --git a/include/econfig-spec.h b/include/econfig-spec.h
index 2a65fb6d4374d5359f745da034459b7ca8887e7f..05ed768f07b55c45807a663dda2d2223afff5450 100644 (file)
--- a/include/econfig-spec.h
+++ b/include/econfig-spec.h
@@ -67,8 +67,8 @@ EMPCFBOTH((fvname), (vname), int, NSC_INT, KM_OPTION, (descr))
 /* econfig key definitions: */
 
 EMPCF_COMMENT("\n### Server configuration and information")
-EMPCFBOTH("config_tables", config_tables, char *, NSC_STRING, KM_INTERNAL,
-    "Configuration table files, separated by space")
+EMPCFBOTH("custom_tables", custom_tables, char *, NSC_STRING, KM_INTERNAL,
+    "Custom configuration table files, separated by space")
 EMPCFBOTH("data", gamedir, char *, NSC_STRING, KM_INTERNAL,
     "Directory where this game's data is stored")
 EMPCFBOTH("info", infodir, char *, NSC_STRING, KM_INTERNAL,

diff --git a/include/prototypes.h b/include/prototypes.h
index 7a7a726da2e726eaaf9c8e4ff1c489b62cd83361..d9da0bbfe0b1440294fc2a770f9d04afe49cd0ca 100644 (file)
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -285,7 +285,7 @@ extern int check_loan_ok(struct lonstr *);
 extern int check_trade_ok(struct trdstr *);
 /* conftab.c */
 extern int read_builtin_tables(void);
-extern int read_config_tables(void);
+extern int read_custom_tables(void);
 /* ef_verify.c */
 /* in file.h */
 /* fsize.c */

diff --git a/src/lib/common/conftab.c b/src/lib/common/conftab.c
index 2389645fe4ef3803758e1c6c9f6ea7939a27a7da..bac7d3663c033cfc679f64736328e6fb317cb0b6 100644 (file)
--- a/src/lib/common/conftab.c
+++ b/src/lib/common/conftab.c
@@ -42,7 +42,7 @@
 #include "optlist.h"
 #include "file.h"
 
-static int read_config_table_file(char *);
+static int read_custom_table_file(char *);
 
 int
 read_builtin_tables(void)
@@ -78,14 +78,14 @@ read_builtin_tables(void)
  * Return 0 on success, -1 on failure.
  */
 int
-read_config_tables(void)
+read_custom_tables(void)
 {
-    char *tmp = strdup(config_tables);
+    char *tmp = strdup(custom_tables);
     char *fname;
     int res = 0;
 
     for (fname = strtok(tmp, " \t"); fname; fname = strtok(NULL, " \t")) {
-       if (read_config_table_file(fname) < 0)
+       if (read_custom_table_file(fname) < 0)
            res = -1;
     }
 
@@ -98,7 +98,7 @@ read_config_tables(void)
  * Return 0 on success, -1 on error.
  */
 static int
-read_config_table_file(char *fname)
+read_custom_table_file(char *fname)
 {
     int res, n;
     FILE *fp;

diff --git a/src/lib/global/land.config b/src/lib/global/land.config
index 76c0ac17547d255b4860a72c0bd8b2800385cbc5..feb29d5ddf4f7c1de93028350438ad11c3650801 100644 (file)
--- a/src/lib/global/land.config
+++ b/src/lib/global/land.config
@@ -41,7 +41,7 @@
 
 # Do not edit this file to customize a game!  Create your own custom
 # configuration file(s), best next to your econfig, and name them in
-# econfig key config_tables.
+# econfig key custom_tables.
 
 config land-chr
 type name                 l_b h_b tech cost ...

diff --git a/src/lib/global/nuke.config b/src/lib/global/nuke.config
index a8ae40eee126a0e79168fa90410511440edad6e0..b2c1ba470dc8a73627015bf92078b4f289d6f2ed 100644 (file)
--- a/src/lib/global/nuke.config
+++ b/src/lib/global/nuke.config
@@ -38,7 +38,7 @@
 
 # Do not edit this file to customize a game!  Create your own custom
 # configuration file(s), best next to your econfig, and name them in
-# econfig key config_tables.
+# econfig key custom_tables.
 
 config nuke-chr
 type name           l_b h_b o_b r_b bla dam  cost tech wei flags

diff --git a/src/lib/global/path.c.in b/src/lib/global/path.c.in
index fb2ae50944f4423a7742e97493bef571bcdb377d..b98198e1c649e99016721af7f018b2777e8107b3 100644 (file)
--- a/src/lib/global/path.c.in
+++ b/src/lib/global/path.c.in
@@ -47,7 +47,7 @@ char dflt_econfig[] = "@econfig@";
 char *configdir;
 
 /* User configuration tables to load (relative to configdir) */
-char *config_tables = "";
+char *custom_tables = "";
 
 /* Where to find built-in configuration tables  (relative to configdir) */
 char *builtindir = "@builtindir@";

diff --git a/src/lib/global/plane.config b/src/lib/global/plane.config
index 5833516ceb47d4187cf669d07c49d48e01cbe159..f1ac7292fbc2fb143b5eb3601013c8613a7d594c 100644 (file)
--- a/src/lib/global/plane.config
+++ b/src/lib/global/plane.config
@@ -46,7 +46,7 @@
 
 # Do not edit this file to customize a game!  Create your own custom
 # configuration file(s), best next to your econfig, and name them in
-# econfig key config_tables.
+# econfig key custom_tables.
 
 config plane-chr
 type name                       l_b h_b cre tech cost ...

diff --git a/src/lib/global/ship.config b/src/lib/global/ship.config
index 5b656b256a4d0ccaaaf094dff5a84923a7e4f3df..cd6fc447f921c02107c576fb0a4bfa04d60b4645 100644 (file)
--- a/src/lib/global/ship.config
+++ b/src/lib/global/ship.config
@@ -48,7 +48,7 @@
 
 # Do not edit this file to customize a game!  Create your own custom
 # configuration file(s), best next to your econfig, and name them in
-# econfig key config_tables.
+# econfig key custom_tables.
 
 config ship-chr
 type name                       l_b h_b tech cost ...

diff --git a/src/server/main.c b/src/server/main.c
index ddd9569e1dc6caf54cf8d38d7761fc4031dab163..37402924afecea41e5369f8a7c74fcc54d8dd1e9 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -217,7 +217,7 @@ main(int argc, char **argv)
        fprintf(stderr, "Can't chdir to %s (%s)\n", configdir, strerror(errno));
        exit(EXIT_FAILURE);
     }
-    if (read_config_tables() < 0)
+    if (read_custom_tables() < 0)
        exit(EXIT_FAILURE);
     if (chdir(gamedir)) {
        fprintf(stderr, "Can't chdir to %s (%s)\n", gamedir, strerror(errno));