Declare update related variables in budg.h. Remove some redundant

declarations elsewhere.

diff --git a/include/budg.h b/include/budg.h
index a5a6ca17361de7e68421d3da018abfe9a203cabc..b6808407fdc470525cee4c5d140b4010c469dd83 100644 (file)
--- 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 a60e52e949404fda2dcc7fe49adabca94f12ba2f..097d9be0674cf38fddc448dd9607cdb03e1a5caf 100644 (file)
--- 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 f6ed81d8b18897765ae86f6561262feea3e8eb7b..16a34228c67cbf0c68835cc72584485013c7a618 100644 (file)
--- 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 9c9656ad6a40e0f97126c530a119d9925e241aeb..649b5ba1093d51ac819bcdb96f6828c71a51e061 100644 (file)
--- 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 30eb3a6a8f15baa3736d18af253eed8db500c422..4a547978ff0c7568e55d8fcd7f28b6d94b64d5c1 100644 (file)
--- 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 f41c701a0b68403f9fe7cd0fa790e01bc29a923e..9115ed572422f5f9a1801593874fff687bc54de1 100644 (file)
--- 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 3d835170abe0adb08c8df5dadd027590b5488895..4f989476ab86eaaac946b21561d0d8a0e0b9936e 100644 (file)
--- 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 c14ed35fb62858e279b7c6dfb41f11f1b558fdcb..3456c7cc9026f9647fd5cc63350be84c2f31c8e7 100644 (file)
--- 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];