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

(populace): Remove parameter vec, work with sp->sct_item[] instead.

Browse source 
This is safe, because the only caller passed a copy of the latter
created with getvec(), and populace() doesn't change it.
(tax): Replace getvec() by direct, read-only item access.
This commit is contained in:
Markus Armbruster 2004-03-10 17:59:37 +00:00
parent 5fb761ab45
commit a46cee180a
3 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/update/prepare.c
View file

@ -113,32 +113,28 @@ void
tax(struct sctstr *sp, struct natstr *np, int etu, long *pop, int *civ_tax,
int *uw_tax, int *mil_pay)
{
int vec[I_MAX + 1];
*civ_tax = 0;
*uw_tax = 0;
*mil_pay = 0;
if (getvec(VT_ITEM, vec, (s_char *)sp, EF_SECTOR) <= 0)
return;
if (!player->simulation)
populace(np, sp, vec, etu);
*civ_tax = (int)(0.5 + vec[I_CIVIL] * sp->sct_effic *
populace(np, sp, etu);
*civ_tax = (int)(0.5 + sp->sct_item[I_CIVIL] * sp->sct_effic *
etu * money_civ / 100);
/*
* captured civs only pay 1/4 taxes
*/
if (sp->sct_own != sp->sct_oldown)
*civ_tax = *civ_tax / 4;
*uw_tax = (int)(0.5 + vec[I_UW] * sp->sct_effic *
*uw_tax = (int)(0.5 + sp->sct_item[I_UW] * sp->sct_effic *
etu * money_uw / 100);
*mil_pay = vec[I_MILIT] * etu * money_mil;
*mil_pay = sp->sct_item[I_MILIT] * etu * money_mil;
/*
* only non-captured civs add to census for nation
*/
if (sp->sct_oldown == sp->sct_own)
*pop += vec[I_CIVIL];
*pop += sp->sct_item[I_CIVIL];
}
int