diff --git a/include/budg.h b/include/budg.h index a5a6ca17..b6808407 100644 --- a/include/budg.h +++ b/include/budg.h @@ -37,4 +37,12 @@ int gt_bg_nmbr(int *bp, struct sctstr *sp, int comm); void pt_bg_nmbr(int *bp, struct sctstr *sp, int comm, int amount); void get_materials(struct sctstr *sp, int *bp, int *mvec, int check); +extern long money[MAXNOC]; +extern long pops[MAXNOC]; +extern long sea_money[MAXNOC]; +extern long lnd_money[MAXNOC]; +extern long air_money[MAXNOC]; +extern long tpops[MAXNOC]; +extern float levels[MAXNOC][4]; + extern int mil_dbl_pay; diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index a60e52e9..097d9be0 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -342,10 +342,6 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws, int etu = etu_per_update; int vec[I_MAX + 1]; long tmp_money; - extern long sea_money[MAXNOC]; - extern long lnd_money[MAXNOC]; - extern long air_money[MAXNOC]; - extern long tpops[MAXNOC]; lnd_money[player->cnum] = sea_money[player->cnum] = 0; air_money[player->cnum] = 0; diff --git a/src/lib/update/land.c b/src/lib/update/land.c index f6ed81d8..16a34228 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -72,7 +72,6 @@ prod_land(int etus, int natnum, int *bp, int build) struct sctstr *sp; struct natstr *np; int n, k = 0; - extern long lnd_money[MAXNOC]; int start_money; int lastx = 9999, lasty = 9999; diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index 9c9656ad..649b5ba1 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -44,6 +44,7 @@ #include "optlist.h" #include "update.h" #include "subs.h" +#include "budg.h" /* * hap and edu avg mean that the weight on current happiness is @@ -128,11 +129,6 @@ limit_level(double level, int type, int flag) void prod_nat(int etu) { - extern long money[MAXNOC]; - extern long pops[MAXNOC]; - extern long sea_money[MAXNOC]; - extern long lnd_money[MAXNOC]; - extern long air_money[MAXNOC]; struct natstr *np; float hap; float edu; diff --git a/src/lib/update/plane.c b/src/lib/update/plane.c index 30eb3a6a..4a547978 100644 --- a/src/lib/update/plane.c +++ b/src/lib/update/plane.c @@ -59,7 +59,6 @@ prod_plane(int etus, int natnum, int *bp, int buildem) /* Build = 1, maintain =0 */ { - extern long air_money[MAXNOC]; register struct plnstr *pp; register struct plchrstr *plp; struct natstr *np; diff --git a/src/lib/update/prepare.c b/src/lib/update/prepare.c index f41c701a..9115ed57 100644 --- a/src/lib/update/prepare.c +++ b/src/lib/update/prepare.c @@ -57,7 +57,6 @@ extern float levels[MAXNOC][4]; void prepare_sects(int etu, int *bp) { - extern long pops[]; register struct sctstr *sp; struct natstr *np; int n, civ_tax, uw_tax, mil_pay; diff --git a/src/lib/update/produce.c b/src/lib/update/produce.c index 3d835170..4f989476 100644 --- a/src/lib/update/produce.c +++ b/src/lib/update/produce.c @@ -44,6 +44,7 @@ #include "subs.h" #include "common.h" #include "optlist.h" +#include "budg.h" static void materials_charge(struct pchrstr *, register int *, register int); @@ -56,8 +57,6 @@ int produce(struct natstr *np, struct sctstr *sp, int *vec, int work, int sctwork, int desig, int neweff, int *cost, int *amount) { - extern float levels[MAXNOC][4]; - extern long tpops[]; register struct pchrstr *product; int vtype; double p_e; diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c index c14ed35f..3456c7cc 100644 --- a/src/lib/update/ship.c +++ b/src/lib/update/ship.c @@ -51,6 +51,7 @@ #include "subs.h" #include "gen.h" #include "lost.h" +#include "budg.h" #ifndef MIN #define MIN(x,y) ((x) > (y) ? (y) : (x)) @@ -68,7 +69,6 @@ prod_ship(int etus, int natnum, int *bp, int build) register struct shpstr *sp; struct natstr *np; int n, k = 0; - extern long sea_money[MAXNOC]; int start_money; int lastx = 9999, lasty = 9999; @@ -114,7 +114,6 @@ upd_ship(register struct shpstr *sp, int shipno, register int etus, struct natstr *np, int *bp, int build) /* build = 1, maintain = 0 */ { - extern long pops[]; struct sctstr *sectp; struct mchrstr *mp; int vec[I_MAX + 1];