(mil_dbl_pay): No effect, remove. Was used for mil being built into

units until that was removed in 4.0.0.

diff --git a/include/budg.h b/include/budg.h
index 538ba0be154a825c42629fac28f56a17103d7ff1..0b112bc843b70a5ebda28b81df4acec769453937 100644 (file)
--- a/include/budg.h
+++ b/include/budg.h
@@ -49,6 +49,4 @@ extern long air_money[MAXNOC];
 extern long tpops[MAXNOC];
 extern float levels[MAXNOC][4];
 
 extern long tpops[MAXNOC];
 extern float levels[MAXNOC][4];
 

-extern int mil_dbl_pay;
-

 #endif
 #endif

diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c
index f13652b56f90a750bd33f0247db4cd9cc5d3906a..ecd85f3a2a5397755c56e7d01383642712fa5650 100644 (file)
--- a/src/lib/commands/budg.c
+++ b/src/lib/commands/budg.c
@@ -197,7 +197,6 @@ calc_all(long p_sect[][2],
     struct sctstr *sp;
     int etu = etu_per_update;
 
     struct sctstr *sp;
     int etu = etu_per_update;
 

-    mil_dbl_pay = 0;

     memset(p_sect, 0, sizeof(**p_sect) * (SCT_TYPE_MAX+2) * 2);
     *taxes = *Ncivs = *Nuws = *bars = *Nbars = *mil = 0;
     *ships = *sbuild = *nsbuild = *smaint = 0;
     memset(p_sect, 0, sizeof(**p_sect) * (SCT_TYPE_MAX+2) * 2);
     *taxes = *Ncivs = *Nuws = *bars = *Nbars = *mil = 0;
     *ships = *sbuild = *nsbuild = *smaint = 0;

diff --git a/src/lib/update/land.c b/src/lib/update/land.c
index a247f1bcb6e59e3f275098715e163ba8e40405d3..2fbab61a053f6b776a932f17e7d4966c5e6ebf93 100644 (file)
--- a/src/lib/update/land.c
+++ b/src/lib/update/land.c
@@ -55,8 +55,6 @@
 #include "common.h"
 #include "gen.h"
 
 #include "common.h"
 #include "gen.h"
 

-int mil_dbl_pay;
-

 static void landrepair(struct lndstr *, struct natstr *, int *, int);
 static void upd_land(struct lndstr *, int, struct natstr *, int *, int);
 static int feed_land(struct lndstr *, int);
 static void landrepair(struct lndstr *, struct natstr *, int *, int);
 static void upd_land(struct lndstr *, int, struct natstr *, int *, int);
 static int feed_land(struct lndstr *, int);


@@ -311,7 +309,6 @@ landrepair(struct lndstr *land, struct natstr *np, int *bp, int etus)
     mvec[I_GUN] = 0;
     mvec[I_MILIT] = 0;
     mvec[I_SHELL] = 0;
     mvec[I_GUN] = 0;
     mvec[I_MILIT] = 0;
     mvec[I_SHELL] = 0;

-    mil_dbl_pay += mvec[I_MILIT];

     get_materials(sp, bp, mvec, 1);
 
     if ((sp->sct_type != SCT_HEADQ) && (sp->sct_type != SCT_FORTR))
     get_materials(sp, bp, mvec, 1);
 
     if ((sp->sct_type != SCT_HEADQ) && (sp->sct_type != SCT_FORTR))

diff --git a/src/lib/update/main.c b/src/lib/update/main.c
index 9e24675a89c790cabf8b02b5d1a3669d3a469dc7..3339ef1bf43bb2498a744af4cfdaa5d97d7b2231 100644 (file)
--- a/src/lib/update/main.c
+++ b/src/lib/update/main.c
@@ -115,7 +115,6 @@ update_main(void *unused)
        long p_sect[SCT_TYPE_MAX+2][2];
 
        memset(p_sect, 0, sizeof(p_sect));
        long p_sect[SCT_TYPE_MAX+2][2];
 
        memset(p_sect, 0, sizeof(p_sect));

-       mil_dbl_pay = 0;

        if (!(np = getnatp(x)))
            continue;
        if (np->nat_stat == STAT_SANCT) {
        if (!(np = getnatp(x)))
            continue;
        if (np->nat_stat == STAT_SANCT) {