empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Declare all configuration variables in optlist.h. Include that

Browse source 
instead of declaring them all over the place.  This uncovered type
errors:
(s_p_etu, adj_update): Defined long, sometimes declared int.  Kills
big endian machines where sizeof(long) != sizeof(int).  Change to
int.

(set_option, delete_option, optstrset, intset, floatset, doubleset,
longset, optionset, optiondel, worldxset): Change linkage to static.
This commit is contained in:
Markus Armbruster 2004-02-17 22:58:04 +00:00
parent 80aae5b8e6
commit 8cd0160176
62 changed files with 143 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/buil.c
View file

@ -80,8 +80,6 @@ extern int etu_per_update;
int
buil(void)
{
extern double buil_bt;
extern double buil_tower_bt;
struct sctstr sect;
struct nstr_sect nstr;
struct natstr *natp;
@ -100,7 +98,6 @@ buil(void)
int gotsect = 0;
int built;
int hold, found, number = 1, x;
extern float drnuke_const;
int asked = 0;
s_char buf[1024];
@ -652,8 +649,6 @@ build_land(register struct sctstr *sp, register struct lchrstr *lp,
static int
build_bridge(register struct sctstr *sp, register int *vec)
{
extern int buil_bh;
extern double buil_bc;
struct sctstr sect;
int val;
int newx, newy;
@ -1003,8 +998,6 @@ build_plane(register struct sctstr *sp, register struct plchrstr *pp,
static int
build_tower(register struct sctstr *sp, register int *vec)
{
extern int buil_tower_bh;
extern double buil_tower_bc;
struct sctstr sect;
int val;
int newx, newy;

3
src/lib/commands/buy.c
View file

@ -78,8 +78,6 @@ buy(void)
time_t now;
double tally;
double canspend;
extern double buytax;
extern double tradetax;
s_char buf[1024];
if (!opt_MARKET) {
@ -224,7 +222,6 @@ buy(void)
int
check_market(void)
{
extern double buytax;
struct comstr comm;
struct sctstr *sect;
struct ichrstr *ip;

1
src/lib/commands/edit.c
View file

@ -690,7 +690,6 @@ static int
docountry(s_char op, int arg, s_char *p, float farg, natid nat,
struct natstr *np)
{
extern int m_m_p_d;
coord newx, newy;
switch (op) {
case 'n':

2
src/lib/commands/fort.c
View file

@ -43,6 +43,7 @@
#include "deity.h"
#include "file.h"
#include "commands.h"
#include "optlist.h"
int
fort(void)
@ -52,7 +53,6 @@ fort(void)
struct lndstr land;
int fort_amt, hard_amt;
s_char *p;
extern int land_mob_max;
s_char buf[1024];
if (!snxtitem(&ni, EF_LAND, player->argp[1]))

3
src/lib/commands/info.c
View file

@ -49,6 +49,7 @@
#include <unistd.h>
#endif
#include "commands.h"
#include "optlist.h"
#if 0
static int fileselect(struct dirent *dp);
@ -92,7 +93,6 @@ strnccmp(s_char *s1, s_char *s2, int n)
int
info(void)
{
extern s_char *infodir;
s_char buf[255];
FILE *fp;
s_char *bp;
@ -272,7 +272,6 @@ printdir(void)
int
apro(void)
{
extern s_char *infodir;
FILE *fp;
s_char *bp, *lbp;
s_char *fbuf;

1
src/lib/commands/look.c
View file

@ -118,7 +118,6 @@ look_ship(register struct shpstr *lookship)
register struct shpstr *sp;
register struct mchrstr *smcp;
register struct mchrstr *tmcp;
extern int ship_max_interdiction_range;
struct sctstr sect;
int range;
int vrange;

1
src/lib/commands/mark.c
View file

@ -62,7 +62,6 @@ pr_mark(struct comstr *comm)
{
time_t now;
double tleft;
extern int MARK_DELAY;
(void)time(&now);
tleft = MARK_DELAY / 3600.0 - (now - comm->com_markettime) / 3600.0;

1
src/lib/commands/mfir.c
View file

@ -780,7 +780,6 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
struct sctstr firing;
struct nstr_sect ns;
struct flist *fp;
extern int torpedo_damage;
int gun;
if (own == 0)

5
src/lib/commands/miss.c
View file

@ -50,6 +50,7 @@
#include "mission.h"
#include "genitem.h"
#include "commands.h"
#include "optlist.h"
/*
* mission <type> <planes/ships/units> <mission type> <op sector> [<radius>]
@ -67,10 +68,6 @@ mission(void)
struct genitem *gp;
int num = 0, mobmax, mobused, dist;
struct nstr_item ni;
extern int ship_mob_max;
extern int land_mob_max;
extern int plane_mob_max;
extern double mission_mob_cost;
s_char prompt[128];
s_char buf[1024];

3
src/lib/commands/mobq.c
View file

@ -47,9 +47,6 @@
int
mobq(void)
{
extern int ship_mob_max;
extern float ship_mob_scale;
extern int etu_per_update;
struct shpstr ship;
s_char *cp, *oldmq;
int good, mobquota, count = 0;

2
src/lib/commands/mult.c
View file

@ -79,8 +79,6 @@ mult(void)
static void
multsingle(natid us, natid them, struct natstr *natp)
{
extern double minmult;
extern double maxmult;
double price;
s_char *p;
s_char prompt[128];

2
src/lib/commands/nati.c
View file

@ -44,8 +44,6 @@
int
nati(void)
{
extern int etu_per_update;
extern double obrate, uwbrate;
struct natstr *natp;
struct sctstr sect;
float hap;

5
src/lib/commands/new.c
View file

@ -64,9 +64,6 @@ static struct range defrealm = { -8, -5, 10, 5, 0, 0 };
int
new(void)
{
extern int max_btus;
extern int players_at_00;
extern int at_least_one_100;
#ifdef START_UNITS
extern int start_unit_type[START_UNITS];
#endif /* START_UNITS */
@ -80,7 +77,6 @@ new(void)
int i;
s_char *p;
int n;
extern int startmob;
s_char buf[1024];
natp = getnatp(player->cnum);
@ -316,7 +312,6 @@ ok(s_char *map, int x, int y)
static int
deity_build_land(int type, coord x, coord y, natid own, int tlev)
{
extern int land_mob_max;
struct lndstr land;
struct lchrstr *lp;
struct nstr_item nstr;

2
src/lib/commands/newe.c
View file

@ -47,8 +47,6 @@
int
newe(void)
{
extern double obrate, uwbrate;
extern int etu_per_update;
struct natstr *natp;
struct sctstr sect;
struct nstr_sect nstr;

2
src/lib/commands/orde.c
View file

@ -333,8 +333,6 @@ orde(void)
static void
eta_calc(struct shpstr *sp, s_char *path, int *len, int *nupdates)
{
extern int etu_per_update;
extern float ship_mob_scale;
struct mchrstr *mcp;
double mobcost, mobil;
int i;

8
src/lib/commands/payo.c
View file

@ -54,14 +54,6 @@ payo(void)
struct mchrstr *mp;
int dist;
float cash = 0.0;
extern int trade_1_dist; /* less than this gets no money */
extern int trade_2_dist; /* less than this gets trade_1 money */
extern int trade_3_dist; /* less than this gets trade_2 money */
extern float trade_1; /* return on trade_1 distance */
extern float trade_2; /* return on trade_2 distance */
extern float trade_3; /* return on trade_3 distance */
extern float trade_ally_bonus; /* 20% bonus for trading with allies */
if (!opt_TRADESHIPS) {
pr("Tradeships are not enabled.\n");

1
src/lib/commands/powe.c
View file

@ -229,7 +229,6 @@ out5(double value, int round_val, int round_flag)
static void
gen_power(void)
{
extern double powe_cost;
float *f_ptr;
float *f_pt2;
register struct powstr *pow;

2
src/lib/commands/prod.c
View file

@ -68,8 +68,6 @@ count_pop(register int n)
int
prod(void)
{
extern double obrate, uwbrate;
extern int etu_per_update;
struct natstr *natp;
struct sctstr sect;
struct nstr_sect nstr;

2
src/lib/commands/sate.c
View file

@ -43,11 +43,11 @@
#include "file.h"
#include "nat.h"
#include "commands.h"
#include "optlist.h"
int
sate(void)
{
extern int plane_mob_max;
double tech;
int pln_uid;
struct plnstr plane;

8
src/lib/commands/scut.c
View file

@ -58,14 +58,6 @@ union item_u {
int
scuttle_tradeship(struct shpstr *sp, int interactive)
{
extern int trade_1_dist; /* less than this gets no money */
extern int trade_2_dist; /* less than this gets trade_1 money */
extern int trade_3_dist; /* less than this gets trade_2 money */
extern float trade_1; /* return on trade_1 distance */
extern float trade_2; /* return on trade_2 distance */
extern float trade_3; /* return on trade_3 distance */
extern float trade_ally_bonus; /* 20% bonus for trading with allies */
extern float trade_ally_cut; /* 10% bonus for ally you trade with */
float cash = 0;
float ally_cash = 0;
int dist;

1
src/lib/commands/show.c
View file

@ -51,7 +51,6 @@ show(void)
struct natstr *natp;
int tlev;
s_char buf[1024];
extern float drnuke_const;
int rlev;
if (!(p = getstarg(player->argp[1],

3
src/lib/commands/torp.c
View file

@ -47,6 +47,7 @@
#include "retreat.h"
#include "damage.h"
#include "commands.h"
#include "optlist.h"
static void anti_torp(int f, int ntorping, int vshipown);
static int candchrg(struct shpstr *, struct shpstr *);
@ -61,7 +62,6 @@ s_char *prsub(struct shpstr *sp);
int
torp(void)
{
extern int torpedo_damage;
natid vshipown;
int range;
int dam;
@ -404,7 +404,6 @@ fire_dchrg(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
static int
fire_torp(struct shpstr *sp, struct shpstr *targ, int range, int ntargets)
{
extern int torpedo_damage;
int dam;
int shells;
double hitchance;

3
src/lib/commands/trad.c
View file

@ -78,8 +78,6 @@ trad(void)
struct trdstr tmpt;
union trdgenstr tg;
int plflags;
extern double tradetax;
extern double buytax;
double canspend;
time_t now;
int bid;
@ -308,7 +306,6 @@ check_trade(void)
{
int n;
int j;
extern double tradetax;
struct nstr_item ni;
struct plnstr plane;
struct lndstr land;

12
src/lib/commands/upda.c
View file

@ -51,7 +51,6 @@ upda(void)
FILE *fp;
struct mob_acc_globals timestamps;
extern int updating_mob;
extern int update_window;
extern s_char *timestampfil;
if (opt_MOB_ACCESS) {
@ -77,14 +76,6 @@ upda(void)
if (opt_UPDATESCHED) {
time_t now, next, delta;
extern int update_time;
extern int update_policy;
extern int update_demandpolicy;
extern int update_wantmin;
extern int blitz_time;
extern s_char *update_times;
extern s_char *update_demandtimes;
extern s_char *game_days;
extern s_char *game_hours;
if (updates_disabled())
pr("UPDATES ARE DISABLED!\n");
@ -164,9 +155,6 @@ upda(void)
return (0);
} else {
extern int s_p_etu;
extern int etu_per_update;
extern int adj_update;
time_t now;
time_t upd_time;
time_t next_update;

38
src/lib/commands/vers.c
View file

@ -52,44 +52,6 @@ extern float drnuke_const;
int
vers(void)
{
extern int s_p_etu;
extern int etu_per_update;
extern int m_m_p_d;
extern int players_at_00;
extern float btu_build_rate;
extern double fgrate, fcrate;
extern double eatrate, babyeat;
extern double obrate, uwbrate;
extern double bankint;
extern double hap_cons, edu_cons;
extern double money_civ, money_uw, money_mil, money_res;
extern float hap_avg, edu_avg, ally_factor;
extern float level_age_rate;
/* extern float easy_tech, hard_tech, tech_log_base; */
extern float easy_tech, tech_log_base;
extern int land_mob_max;
extern int land_grow_scale;
extern float land_mob_scale;
extern int sect_mob_max;
extern float sect_mob_scale;
extern int ship_mob_max;
extern float ship_mob_scale;
extern int ship_grow_scale;
extern int plane_mob_max;
extern float plane_mob_scale;
extern int plane_grow_scale;
extern int War_Cost;
extern float fire_range_factor;
extern int trade_1_dist; /* less than this gets no money */
extern int trade_2_dist; /* less than this gets trade_1 money */
extern int trade_3_dist; /* less than this gets trade_2 money */
extern float trade_1; /* return on trade_1 distance */
extern float trade_2; /* return on trade_2 distance */
extern float trade_3; /* return on trade_3 distance */
extern float trade_ally_bonus; /* 20% bonus for trading with allies */
extern float trade_ally_cut; /* 10% bonus for ally you trade with */
extern double tradetax;
extern double buytax;
struct option_list *op;
time_t now;

1
src/lib/commands/work.c
View file

@ -55,7 +55,6 @@ work(void)
struct lndstr land;
int work_amt, eff_amt, w;
s_char *p;
extern int land_mob_max;
coord donex = 0, doney = 1;
s_char buf[1024];