empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(calc_all): Match the real update sequence. Until removal of budget

Browse source 
priorities (rev. 1.25), calc_all() tried to match the real sequence,
but didn't quire succeed to cope with all variations.  Then it matched
until the update sequence change in src/lib/update/main.c rev. 1.25.
This is required but not sufficient for closing #1310407.
This commit is contained in:
Markus Armbruster 2006-06-10 16:20:31 +00:00
parent 4a5700e572
commit 82bbb318dc
1 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/lib/commands/budg.c
View file

@ -226,36 +226,42 @@ calc_all(long p_sect[][2],
*mil += upd_slmilcosts(np->nat_cnum, etu); *mil += upd_slmilcosts(np->nat_cnum, etu);
/* Maintain and build ships */ /* Maintain ships */
sea_money[player->cnum] = 0; sea_money[player->cnum] = 0;
*ships = prod_ship(etu, player->cnum, bp, 0); *ships = prod_ship(etu, player->cnum, bp, 0);
*smaint = sea_money[player->cnum]; *smaint = sea_money[player->cnum];
/* Maintain planes */
air_money[player->cnum] = 0;
*planes = prod_plane(etu, player->cnum, bp, 0);
*pmaint = air_money[player->cnum];
/* Maintain land units */
lnd_money[player->cnum] = 0;
*units = prod_land(etu, player->cnum, bp, 0);
*lmaint = lnd_money[player->cnum];
/* Produce */
produce_sect(player->cnum, etu, bp, p_sect);
/* Build ships */
sea_money[player->cnum] = 0; sea_money[player->cnum] = 0;
*nsbuild = prod_ship(etu, player->cnum, bp, 1); *nsbuild = prod_ship(etu, player->cnum, bp, 1);
*sbuild = sea_money[player->cnum]; *sbuild = sea_money[player->cnum];
sea_money[player->cnum] = 0; sea_money[player->cnum] = 0;
/* Maintain and build planes */ /* Build planes */
air_money[player->cnum] = 0;
*planes = prod_plane(etu, player->cnum, bp, 0);
*pmaint = air_money[player->cnum];
air_money[player->cnum] = 0; air_money[player->cnum] = 0;
*npbuild = prod_plane(etu, player->cnum, bp, 1); *npbuild = prod_plane(etu, player->cnum, bp, 1);
*pbuild = air_money[player->cnum]; *pbuild = air_money[player->cnum];
air_money[player->cnum] = 0; air_money[player->cnum] = 0;
/* Maintain and build land units */ /* Build land units */
lnd_money[player->cnum] = 0;
*units = prod_land(etu, player->cnum, bp, 0);
*lmaint = lnd_money[player->cnum];
lnd_money[player->cnum] = 0; lnd_money[player->cnum] = 0;
*nlbuild = prod_land(etu, player->cnum, bp, 1); *nlbuild = prod_land(etu, player->cnum, bp, 1);
*lbuild = lnd_money[player->cnum]; *lbuild = lnd_money[player->cnum];
lnd_money[player->cnum] = 0; lnd_money[player->cnum] = 0;
/* Produce */
produce_sect(player->cnum, etu, bp, p_sect);
free(bp); free(bp);
} }