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

Replace getvec() by direct, read-only item access in some cases where

Browse source 
that's obviously correct.
This commit is contained in:
Markus Armbruster 2004-03-05 10:38:58 +00:00
parent 99bfa19a92
commit b1461faea5
23 changed files with 164 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -326,7 +326,6 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws,
int n, civ_tax, uw_tax, mil_pay;
struct sctstr *sp;
int etu = etu_per_update;
int vec[I_MAX + 1];
long tmp_money;
lnd_money[player->cnum] = sea_money[player->cnum] = 0;
@ -341,14 +340,13 @@ calc_all(long int (*p_sect)[2], int *taxes, int *Ncivs, int *Nuws,
if (sp->sct_own == player->cnum) {
sp->sct_updated = 0;
tax(sp, np, etu, &pop, &civ_tax, &uw_tax, &mil_pay);
getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR);
*Ncivs += vec[I_CIVIL];
*Nuws += vec[I_UW];
*Ncivs += sp->sct_item[I_CIVIL];
*Nuws += sp->sct_item[I_UW];
*taxes += civ_tax + uw_tax;
*mil += mil_pay;
if (sp->sct_type == SCT_BANK) {
*bars += bank_income(sp, etu);
*Nbars += vec[I_BAR];
*Nbars += sp->sct_item[I_BAR];
}
}
}