From 966eb40899543bf2dcada38283d1f0bc1948f593 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 19 Feb 2004 16:46:18 +0000 Subject: [PATCH] Declare all configuration parameters in optlist.h. Remove some redundant declarations elsewhere. --- include/optlist.h | 94 ++++++++++++++++++++++++---------------- src/lib/commands/disa.c | 2 +- src/lib/commands/enab.c | 3 +- src/lib/commands/mobu.c | 1 - src/lib/commands/turn.c | 3 +- src/lib/commands/upda.c | 2 - src/lib/common/wantupd.c | 1 - src/lib/global/options.c | 4 +- src/lib/player/empdis.c | 2 +- src/lib/player/login.c | 1 - src/lib/player/player.c | 3 +- src/server/timestamp.c | 3 +- src/util/files.c | 2 - 13 files changed, 64 insertions(+), 57 deletions(-) diff --git a/include/optlist.h b/include/optlist.h index f1d86ff85..e099d5624 100644 --- 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 6ba41b81f..ae9bdcc5f 100644 --- a/src/lib/commands/disa.c +++ b/src/lib/commands/disa.c @@ -34,11 +34,11 @@ #include #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 45ce67fba..d5ac21664 100644 --- a/src/lib/commands/enab.c +++ b/src/lib/commands/enab.c @@ -35,12 +35,11 @@ #include #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 3ba3df28d..f67dd0b19 100644 --- 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 158f5c178..d5cfa84fc 100644 --- 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 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 4541b2ee1..0bd8c59b7 100644 --- 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 7dd84c86a..0eea04421 100644 --- 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 7c193fbef..8e8f06886 100644 --- 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 fdc6e6a1b..8a254b82c 100644 --- 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 #include @@ -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 4a185cde5..8d1a67fde 100644 --- 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 90ee70af5..a1746a46c 100644 --- 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 @@ -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 c481297bf..14e6dee11 100644 --- a/src/server/timestamp.c +++ b/src/server/timestamp.c @@ -39,12 +39,12 @@ #include "empthread.h" #include #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 c942b3c8a..738a5b401 100644 --- 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; -- 2.43.0