diff --git a/src/lib/update/sect.c b/src/lib/update/sect.c index 1b87dc76..a872acb7 100644 --- a/src/lib/update/sect.c +++ b/src/lib/update/sect.c @@ -223,7 +223,7 @@ void produce_sect(struct natstr *np, int etu, struct bp *bp, int p_sect[][2]) { struct sctstr *sp, scratch_sect; - int work, cost, ecost, pcost; + int cost, ecost, pcost; int n, amount; for (n = 0; NULL != (sp = getsectid(n)); n++) { @@ -249,14 +249,14 @@ produce_sect(struct natstr *np, int etu, struct bp *bp, int p_sect[][2]) sp = &scratch_sect; } - work = do_feed(sp, np, etu, 0); + sp->sct_avail = do_feed(sp, np, etu, 0); if (sp->sct_off || np->nat_money < 0) { + sp->sct_avail = 0; bp_set_from_sect(bp, sp); continue; } - sp->sct_avail = work; amount = 0; pcost = cost = ecost = 0; diff --git a/tests/update/final.xdump b/tests/update/final.xdump index f39debd0..0d787749 100644 --- a/tests/update/final.xdump +++ b/tests/update/final.xdump @@ -24,7 +24,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 1 11 1 24 13 120 0 6 0 0 0 0 0 11 1 12 0 0 0 24 0 0 0 0 0 1 34 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 1 13 1 15 100 120 0 0 0 0 0 0 0 13 1 0 0 100 0 15 0 0 100 0 0 1 34 0 0 0 0 0 0 0 165 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 1 15 1 15 100 120 0 3 0 0 0 0 0 15 1 0 0 0 1 15 0 0 100 0 0 1 0 34 0 0 0 0 0 0 99 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 -2 -15 1 5 100 120 0 0 0 0 0 0 0 -15 1 100 0 100 1 5 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 +2 -15 1 5 100 120 0 0 0 0 0 0 0 -15 1 0 0 100 1 5 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 -13 1 5 100 120 0 0 0 0 0 0 0 -13 1 0 0 100 0 5 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 -11 1 5 100 120 0 0 0 0 0 0 0 -11 1 0 0 100 0 5 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 2 -9 1 5 100 120 0 0 0 0 0 0 0 -9 1 0 0 100 0 5 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 0 0 0 0 0 diff --git a/tests/update/journal.log b/tests/update/journal.log index 80248627..cb9bba24 100644 --- a/tests/update/journal.log +++ b/tests/update/journal.log @@ -929,7 +929,7 @@ Play#0 output Play#0 1 2 -6,0 - 0% 120 .. .. 130 0 0 96 100% 0 0 Play#0 output Play#0 1 2 -4,0 - 0% 120 .. .. 130 0 0 97 100% 0 0 Play#0 output Play#0 1 2 -2,0 c 10% 120 .. .. 130 0 0 97 100% 0 0 - Play#0 output Play#0 1 2 -15,1 c 100% 120 .. .. 130 0 0 97 100% 100 0 1 + Play#0 output Play#0 1 2 -15,1 c 100% 120 .. .. 130 0 0 97 100% 0 0 1 Play#0 output Play#0 1 2 -13,1 c 100% 120 .. .. 130 0 0 97 100% 0 0 Play#0 output Play#0 1 2 -11,1 c 100% 120 .. .. 130 0 0 97 100% 0 0 Play#0 output Play#0 1 2 -9,1 c 100% 120 .. .. 130 0 0 97 100% 0 0