update: Get army, navy, air force delta from nat_budget[]

lnd_money[], sea_money[] and air_money[] have become redundant.
Eliminate them.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/update.h b/include/update.h
index 53d7ec41123d69b2168ec991e1a2e94e996189e2..ed5c3a8e1b900e6185a778dc2ef10398863f4bbf 100644 (file)
--- a/include/update.h
+++ b/include/update.h
@@ -70,9 +70,6 @@ struct budget {
 extern struct budget nat_budget[MAXNOC];
 extern int money[MAXNOC];
 extern int pops[MAXNOC];
-extern int sea_money[MAXNOC];
-extern int lnd_money[MAXNOC];
-extern int air_money[MAXNOC];
 extern int tpops[MAXNOC];
 /* nat.c */
 extern float levels[MAXNOC][4];

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 92a309266be2e4161b0556cf0fabf4f90edc23c4..bb94701622502d398d6c8a6d5823965711cac6b6 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -49,9 +49,6 @@
 struct budget nat_budget[MAXNOC];
 int money[MAXNOC];
 int pops[MAXNOC];
-int sea_money[MAXNOC];
-int lnd_money[MAXNOC];
-int air_money[MAXNOC];
 int tpops[MAXNOC];
 
 void
@@ -89,9 +86,6 @@ update_main(void)
      */
     memset(nat_budget, 0, sizeof(nat_budget));
     memset(pops, 0, sizeof(pops));
-    memset(air_money, 0, sizeof(air_money));
-    memset(sea_money, 0, sizeof(sea_money));
-    memset(lnd_money, 0, sizeof(lnd_money));
     for (n = 0; n < MAXNOC; n++) {
        money[n] = 0;
        if (!(np = getnatp(n)))
@@ -123,12 +117,6 @@ update_main(void)
        prod_ship(etu, i, NULL, 1);
        prod_plane(etu, i, NULL, 1);
        prod_land(etu, i, NULL, 1);
-       sea_money[i] += nat_budget[i].bm[BUDG_SHP_MAINT].money
-           + nat_budget[i].bm[BUDG_SHP_BUILD].money;
-       air_money[i] += nat_budget[i].bm[BUDG_PLN_MAINT].money
-           + nat_budget[i].bm[BUDG_PLN_BUILD].money;
-       lnd_money[i] += nat_budget[i].bm[BUDG_LND_MAINT].money
-           + nat_budget[i].bm[BUDG_LND_BUILD].money;
     }
     logerror("done producing for countries.");
 

diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c
index b029242066da408449f562ed4dcc59cef5689ca2..24f5d597cd500682f3b1472a0a33170bb460e986 100644 (file)
--- a/src/lib/update/nat.c
+++ b/src/lib/update/nat.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1997
- *     Markus Armbruster, 2006-2015
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
@@ -127,11 +127,13 @@ prod_nat(int etu)
     float edu;
     float hap_edu;
     int pop;
+    int sea_money, air_money, lnd_money;
     double rlev;
     double tlev;
     double tech[MAXNOC];
     double res[MAXNOC];
     double newvalue;
+    struct budg_item *bm;
     natid n;
     int cn;
     struct natstr *cnp;
@@ -204,11 +206,14 @@ prod_nat(int etu)
            np->nat_level[NAT_RLEV] += rlev;
        if (tlev != 0.0)
            np->nat_level[NAT_TLEV] += tlev;
-       if ((sea_money[n] != 0) || (air_money[n] != 0) ||
-           (lnd_money[n] != 0))
+       bm = nat_budget[n].bm;
+       sea_money = bm[BUDG_SHP_MAINT].money + bm[BUDG_SHP_BUILD].money;
+       air_money = bm[BUDG_PLN_MAINT].money + bm[BUDG_PLN_BUILD].money;
+       lnd_money = bm[BUDG_LND_MAINT].money + bm[BUDG_LND_BUILD].money;
+       if (sea_money || air_money || lnd_money)
            wu(0, n,
               "Army delta $%d, Navy delta $%d, Air force delta $%d\n",
-              lnd_money[n], sea_money[n], air_money[n]);
+              lnd_money, sea_money, air_money);
        wu(0, n, "money delta was $%d for this update\n",
           np->nat_money - money[n]);
        if (opt_LOSE_CONTACT) {