New SCT_BUDG_MAX

diff --git a/include/budg.h b/include/budg.h
index d9de58dc9340d7d8e5575e9e6ac43bf7e39dbcdd..f07cff133eb3608c672b59f9687aca329916ab08 100644 (file)
--- 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 32cc423a5e5e4fafe61cfa3f458090b3bde90bfe..846d04d6f8d4091b969c907d028146636d620cac 100644 (file)
--- 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 03345930e38a85d7e2ff4615672ef62b32c2c042..e8a46bf181d02ea2df7faafffca2a8dfd098537d 100644 (file)
--- 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)))