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

(share_incr): Simplify country status check for tech bleed

Browse source 
participation.  Only STAT_SANCT and STAT_ACTIVE receive, and only
STAT_ACTIVE bleed.  Both used to be STAT_NEW, STAT_SANCT, STAT_ACTIVE.
This commit is contained in:
Markus Armbruster 2006-01-07 09:35:39 +00:00
parent cd668a99a6
commit c3ff418ed2
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -241,21 +241,13 @@ share_incr(double *res, double *tech)
for (i = 0; NULL != (np = getnatp(i)); i++) {
res[i] = tech[i] = 0.0;
if (np->nat_stat == STAT_UNUSED)
continue;
if (np->nat_stat == STAT_GOD)
continue;
if (np->nat_stat == STAT_VIS)
if (np->nat_stat < STAT_SANCT || np->nat_stat == STAT_GOD)
continue;
rnc = tnc = 0;
for (j = 0; NULL != (other = getnatp(j)); j++) {
if (j == i)
continue;
if (other->nat_stat == STAT_GOD)
continue;
if (other->nat_stat == STAT_VIS)
continue;
if (other->nat_stat == STAT_UNUSED)
if (other->nat_stat != STAT_ACTIVE)
continue;
if (opt_HIDDEN) {
if (!getcontact(np, j))
@ -281,8 +273,6 @@ share_incr(double *res, double *tech)
}
}
}
if (rnc == 0 && tnc == 0)
continue;
if (rnc > 0) {
res[i] /= rnc * ally_factor;
}