From c3ff418ed263855959e8718472aff6a57d9941ae Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 7 Jan 2006 09:35:39 +0000 Subject: [PATCH] (share_incr): Simplify country status check for tech bleed participation. Only STAT_SANCT and STAT_ACTIVE receive, and only STAT_ACTIVE bleed. Both used to be STAT_NEW, STAT_SANCT, STAT_ACTIVE. --- src/lib/update/nat.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/lib/update/nat.c b/src/lib/update/nat.c index 0780746f..debcbbca 100644 --- a/src/lib/update/nat.c +++ b/src/lib/update/nat.c @@ -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; }