Declare all configuration parameters in optlist.h. Remove some

redundant declarations elsewhere.

diff --git a/include/optlist.h b/include/optlist.h
index f1d86ff853a7c570af846b80cd5fcb0a74397e02..e099d56242924961aa2343fa61150a7f236383b5 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -42,57 +42,58 @@ struct option_list {
 
 extern struct option_list Options[];
 
-extern int opt_NO_FORT_FIRE;
-extern int opt_TREATIES;
+/* Options, can be switched in econfig */
+extern int opt_ALL_BLEED;
+extern int opt_BIG_CITY;
+extern int opt_BLITZ;
 extern int opt_BRIDGETOWERS;
+extern int opt_DEFENSE_INFRA;
+extern int opt_DEMANDUPDATE;
+extern int opt_DRNUKE;
+extern int opt_EASY_BRIDGES;
+extern int opt_FALLOUT;
+extern int opt_FUEL;
 extern int opt_GODNEWS;
 extern int opt_GO_RENEW;
-extern int opt_DEFENSE_INFRA;
-extern int opt_SHIP_DECAY;
-extern int opt_MOB_ACCESS;
-extern int opt_MARKET;
-extern int opt_LOANS;
-extern int opt_LANDSPIES;
-extern int opt_PLANENAMES;
-extern int opt_NO_LCMS;
-extern int opt_NO_HCMS;
-extern int opt_NO_OIL;
-extern int opt_NOFOOD;
-extern int opt_SNEAK_ATTACK;
-extern int opt_BLITZ;
+extern int opt_GRAB_THINGS;
 extern int opt_HIDDEN;
+extern int opt_INTERDICT_ATT;
+extern int opt_LANDSPIES;
+extern int opt_LOANS;
 extern int opt_LOSE_CONTACT;
-extern int opt_NONUKES;
-extern int opt_FUEL;
-extern int opt_TRADESHIPS;
+extern int opt_MARKET;
+extern int opt_MOB_ACCESS;
+extern int opt_NEUTRON;
 extern int opt_NEWPOWER;
-extern int opt_NOMOBCOST;
-extern int opt_SUPER_BARS;
-extern int opt_EASY_BRIDGES;
-extern int opt_ALL_BLEED;
-extern int opt_DRNUKE;
-extern int opt_SLOW_WAR;
-extern int opt_NO_PLAGUE;
 extern int opt_NEW_STARVE;
 extern int opt_NEW_WORK;
-extern int opt_RES_POP;
-extern int opt_GRAB_THINGS;
-extern int opt_SHOWPLANE;
+extern int opt_NOFOOD;
+extern int opt_NOMOBCOST;
+extern int opt_NONUKES;
+extern int opt_NO_FORT_FIRE;
+extern int opt_NO_HCMS;
+extern int opt_NO_LCMS;
+extern int opt_NO_OIL;
+extern int opt_NO_PLAGUE;
+extern int opt_NUKEFAILDETONATE;
 extern int opt_ORBIT;
 extern int opt_PINPOINTMISSILE;
-extern int opt_FALLOUT;
+extern int opt_PLANENAMES;
+extern int opt_RES_POP;
+extern int opt_ROLLOVER_AVAIL;
 extern int opt_SAIL;
-extern int opt_NUKEFAILDETONATE;
-extern int opt_MISSINGMISSILES;
-extern int opt_SHIPNAMES;      /* not used currently */
-extern int opt_NEUTRON;
-extern int opt_UPDATESCHED;
-extern int opt_DEMANDUPDATE;
-extern int opt_BIG_CITY;
-extern int opt_INTERDICT_ATT;
+extern int opt_SHIPNAMES;
+extern int opt_SHIP_DECAY;
+extern int opt_SHOWPLANE;
+extern int opt_SLOW_WAR;
+extern int opt_SNEAK_ATTACK;
+extern int opt_SUPER_BARS;
 extern int opt_TECH_POP;
-extern int opt_ROLLOVER_AVAIL;
+extern int opt_TRADESHIPS;
+extern int opt_TREATIES;
+extern int opt_UPDATESCHED;
 
+/* Game parameters, can be set in econfig */
 extern s_char *datadir;
 extern s_char *infodir;
 extern s_char *loginport;
@@ -202,6 +203,23 @@ extern int fuel_mult;
 extern int lost_items_timeout;
 extern long last_demand_update;
 
+/* Game parameters that cannot be set in econfig (yet) */
+extern int melt_item_denom[];
+#ifdef START_UNITS
+int start_unit_type[];
+#endif
+
+/* Variables that get values derived from econfig */
+extern s_char *upfil;
+extern s_char *downfil;
+extern s_char *disablefil;
+extern s_char *telfil;
+extern s_char *annfil;
+extern s_char *commfil;
+extern s_char *banfil;
+extern s_char *authfil;
+extern s_char *timestampfil;
+
 struct keymatch {
     s_char *km_key;            /* the key */
     void (*km_func)(struct keymatch * kp, s_char **av);

diff --git a/src/lib/commands/disa.c b/src/lib/commands/disa.c
index 6ba41b81f0a03bff6dcc6fc6615cf3b8c4ad37f0..ae9bdcc5fe09efd465a6e26d98c3fbdfa64cebb1 100644 (file)
--- a/src/lib/commands/disa.c
+++ b/src/lib/commands/disa.c
@@ -34,11 +34,11 @@
 #include <fcntl.h>
 #include "misc.h"
 #include "commands.h"
+#include "optlist.h"
 
 int
 disa(void)
 {
-    extern s_char *disablefil;
     int fd;
 
     if ((fd = open(disablefil, O_RDWR | O_CREAT | O_TRUNC, 0660)) < 0)

diff --git a/src/lib/commands/enab.c b/src/lib/commands/enab.c
index 45ce67fba266fe40a7e89e198f19331cef40cc05..d5ac21664de46b3aa796db0164dea3bddf5b5c58 100644 (file)
--- a/src/lib/commands/enab.c
+++ b/src/lib/commands/enab.c
@@ -35,12 +35,11 @@
 #include <fcntl.h>
 #include "misc.h"
 #include "commands.h"
+#include "optlist.h"
 
 int
 enab(void)
 {
-    extern s_char *disablefil;
-
     (void)unlink(disablefil);
     pr("Updates are enabled\n");
     return RET_OK;

diff --git a/src/lib/commands/mobu.c b/src/lib/commands/mobu.c
index 3ba3df28db7ce3725ed8740e0118dd35b147d896..f67dd0b195e2341f0ff561c5972a6394343ed45d 100644 (file)
--- a/src/lib/commands/mobu.c
+++ b/src/lib/commands/mobu.c
@@ -55,7 +55,6 @@ mobupdate(void)
     extern int updating_mob;
     struct mob_acc_globals timestamps;
     long now;
-    extern s_char *timestampfil;
 
     if (!opt_MOB_ACCESS) {
        pr("Command invalid - MOB_ACCESS is not enabled.\n");

diff --git a/src/lib/commands/turn.c b/src/lib/commands/turn.c
index 158f5c178f7fc77f682f4c85641059f4f3b4f166..d5cfa84fc7e9372209628991eddd087f9425e5ee 100644 (file)
--- a/src/lib/commands/turn.c
+++ b/src/lib/commands/turn.c
@@ -35,14 +35,13 @@
 #include "player.h"
 #include "tel.h"
 #include "commands.h"
+#include "optlist.h"
 
 #include <fcntl.h>
 
 int
 turn(void)
 {
-    extern s_char *upfil;
-    extern s_char *downfil;
     int fd;
     struct telstr tgm;
     register s_char *p;

diff --git a/src/lib/commands/upda.c b/src/lib/commands/upda.c
index 4541b2ee1f16b40c3a1aebd4d8f89cd338834056..0bd8c59b7a2ca10305a98fe66688ba0339e2ca3b 100644 (file)
--- a/src/lib/commands/upda.c
+++ b/src/lib/commands/upda.c
@@ -37,7 +37,6 @@
 #include "player.h"
 #include "commands.h"
 #include "optlist.h"
-
 #include "keyword.h"
 #include "wantupd.h"
 
@@ -51,7 +50,6 @@ upda(void)
     FILE *fp;
     struct mob_acc_globals timestamps;
     extern int updating_mob;
-    extern s_char *timestampfil;
 
     if (opt_MOB_ACCESS) {
 #if !defined(_WIN32)

diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index 7dd84c86a5e51d01d36e93ae38c11d39a7b3211b..0eea044218f7ff112d68241f6cad705382420f57 100644 (file)
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -374,7 +374,6 @@ next_update_check_time(time_t * now, time_t * tim, time_t * delta)
 int
 updates_disabled(void)
 {
-    extern s_char *disablefil;
     int fd;
 
     if ((fd = open(disablefil, O_RDONLY, 0)) < 0)

diff --git a/src/lib/global/options.c b/src/lib/global/options.c
index 7c193fbef62af784721937cc43fc4c2f4efcd4ff..8e8f06886f9b05ededcd0e0d6120851b95fcf62b 100644 (file)
--- a/src/lib/global/options.c
+++ b/src/lib/global/options.c
@@ -286,9 +286,9 @@ int opt_NUKEFAILDETONATE = 0;
 #endif
 
 #ifdef SHIPNAMES
-int opt_SHIPNAMES = 1;         /* not used currently */
+int opt_SHIPNAMES = 1;
 #else
-int opt_SHIPNAMES = 0;         /* not used currently */
+int opt_SHIPNAMES = 0;
 #endif
 
 #ifdef NEUTRON

diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c
index fdc6e6a1bff421aa06719bb1a4f69bc288b7cc93..8a254b82cc45d4c5098fb04041d5d5273e207e06 100644 (file)
--- a/src/lib/player/empdis.c
+++ b/src/lib/player/empdis.c
@@ -46,6 +46,7 @@
 #include "empio.h"
 #include "subs.h"
 #include "common.h"
+#include "optlist.h"
 
 #include <fcntl.h>
 #include <time.h>
@@ -154,7 +155,6 @@ explain(void)
 int
 gamedown(void)
 {
-    extern s_char *downfil;
     int downf;
     struct telstr tgm;
     s_char buf[1024];

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 4a185cde519da15339aa83027c5aafb859b0f22a..8d1a67fde27edc6b8b18c952a486b4aa4f81258a 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -209,7 +209,6 @@ pass_cmd(void)
 static int
 play_cmd(void)
 {
-    extern char *banfil;
     struct player *other;
     natid cnum;
     struct natstr *natp;

diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index 90ee70af590215fdd5bd5d96cdea6af994e0f6d6..a1746a46ca886640ef18bb501a5d4b7fd23b88d7 100644 (file)
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -51,6 +51,7 @@
 #include "gen.h"
 #include "subs.h"
 #include "common.h"
+#include "optlist.h"
 
 #if !defined(_WIN32)
 #include <unistd.h>
@@ -65,7 +66,6 @@ extern int m_m_p_d;
 void
 player_main(struct player *p)
 {
-    extern s_char *authfil;
     struct natstr *natp;
     int hour[2];
     int secs;
@@ -347,7 +347,6 @@ execute(void)
 int
 show_motd(void)
 {
-    extern s_char *upfil;
     int upf;
     struct telstr tgm;
     s_char buf[MAXTELSIZE];

diff --git a/src/server/timestamp.c b/src/server/timestamp.c
index c481297bf73cf3348b5f922f553f58c920c925e0..14e6dee117f38a7dbef40bec6ea2a0ca593c221b 100644 (file)
--- a/src/server/timestamp.c
+++ b/src/server/timestamp.c
@@ -39,12 +39,12 @@
 #include "empthread.h"
 #include <stdio.h>
 #include "prototypes.h"
+#include "optlist.h"
 
 /*ARGSUSED*/
 void
 mobility_check(void *argv)
 {
-    extern s_char *timestampfil;
     extern int updating_mob;
     struct mob_acc_globals timestamps;
     time_t now;
@@ -93,7 +93,6 @@ mobility_check(void *argv)
 void
 mobility_init(void)
 {
-    extern s_char *timestampfil;
     extern int updating_mob;
     struct mob_acc_globals timestamps;
     time_t now;

diff --git a/src/util/files.c b/src/util/files.c
index c942b3c8a6c0e136e55c3288672e5eaf77946454..738a5b401f6326ca93ac073088d9db59bc1bb959 100644 (file)
--- a/src/util/files.c
+++ b/src/util/files.c
@@ -71,8 +71,6 @@ static void file_sct_init(coord x, coord y, s_char *ptr);
 int
 main(int argc, char *argv[])
 {
-    extern s_char *timestampfil;
-    extern s_char *commfil;
     s_char buf[255];
     s_char tbuf[512];
     s_char *filename;