From 1f60baf818e37286036709850cf90d714d2c62e9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 20 Feb 2009 18:21:37 +0100 Subject: [PATCH] New SCT_BUDG_MAX --- include/budg.h | 1 + src/lib/commands/budg.c | 4 ++-- src/lib/update/main.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/budg.h b/include/budg.h index d9de58dc9..f07cff133 100644 --- a/include/budg.h +++ b/include/budg.h @@ -38,6 +38,7 @@ #include "item.h" #define SCT_EFFIC (SCT_TYPE_MAX + 1) +#define SCT_BUDG_MAX SCT_EFFIC struct bp *bp_alloc(void); void bp_set_from_sect(struct bp *, struct sctstr *); diff --git a/src/lib/commands/budg.c b/src/lib/commands/budg.c index 32cc423a5..846d04d6f 100644 --- a/src/lib/commands/budg.c +++ b/src/lib/commands/budg.c @@ -57,7 +57,7 @@ int budg(void) { int i; - long p_sect[SCT_TYPE_MAX+2][2]; + long p_sect[SCT_BUDG_MAX+1][2]; int taxes, Ncivs, Nuws, bars, Nbars, mil; int ships, sbuild, nsbuild, smaint; int units, lbuild, nlbuild, lmaint; @@ -190,7 +190,7 @@ calc_all(long p_sect[][2], struct sctstr *sp; int etu = etu_per_update; - memset(p_sect, 0, sizeof(**p_sect) * (SCT_TYPE_MAX+2) * 2); + memset(p_sect, 0, sizeof(**p_sect) * (SCT_BUDG_MAX+1) * 2); *taxes = *Ncivs = *Nuws = *bars = *Nbars = *mil = 0; *ships = *sbuild = *nsbuild = *smaint = 0; *units = *lbuild = *nlbuild = *lmaint = 0; diff --git a/src/lib/update/main.c b/src/lib/update/main.c index 03345930e..e8a46bf18 100644 --- a/src/lib/update/main.c +++ b/src/lib/update/main.c @@ -101,7 +101,7 @@ update_main(void) logerror("done preparing sectors."); logerror("producing for countries..."); for (i = 0; i < MAXNOC; i++) { - long p_sect[SCT_TYPE_MAX+2][2]; + long p_sect[SCT_BUDG_MAX+1][2]; memset(p_sect, 0, sizeof(p_sect)); if (!(np = getnatp(i))) -- 2.43.0