From 591b8d486230e6c44a361b5d193d42670fdccc1d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 22 Jun 2006 20:45:19 +0000 Subject: [PATCH] (mil_dbl_pay): No effect, remove. Was used for mil being built into units until that was removed in 4.0.0. --- include/budg.h | 2 -- src/lib/commands/budg.c | 1 - src/lib/update/land.c | 3 --- src/lib/update/main.c | 1 - 4 files changed, 7 deletions(-) diff --git a/include/budg.h b/include/budg.h index 538ba0be..0b112bc8 100644 --- 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 int mil_dbl_pay; - #endif diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index f13652b5..ecd85f3a 100644 --- 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; - 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; diff --git a/src/lib/update/land.c b/src/lib/update/land.c index a247f1bc..2fbab61a 100644 --- a/src/lib/update/land.c +++ b/src/lib/update/land.c @@ -55,8 +55,6 @@ #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); @@ -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; - mil_dbl_pay += mvec[I_MILIT]; 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 9e24675a..3339ef1b 100644 --- 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)); - mil_dbl_pay = 0; if (!(np = getnatp(x))) continue; if (np->nat_stat == STAT_SANCT) {