/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
struct natstr *cnp;
for (n = 0; NULL != (np = getnatp(n)); n++) {
- if ((np->nat_stat & STAT_NORM) == 0)
+ if (np->nat_stat < STAT_ACTIVE)
continue;
/*
* hap_edu: the more education people have, the
memset(tech, 0, sizeof(tech));
}
for (n = 0; NULL != (np = getnatp(n)); n++) {
- if ((np->nat_stat & STAT_NORM) == 0)
+ if (np->nat_stat < STAT_ACTIVE)
continue;
tlev = levels[n][NAT_TLEV];
rlev = levels[n][NAT_RLEV];
for (i = 0; NULL != (np = getnatp(i)); i++) {
res[i] = tech[i] = 0.0;
- if ((np->nat_stat & STAT_INUSE) == 0)
- continue;
- if (np->nat_stat & STAT_GOD)
- continue;
- if (np->nat_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 == VIS)
- continue;
- if ((other->nat_stat & STAT_INUSE) == 0)
+ if (other->nat_stat != STAT_ACTIVE)
continue;
if (opt_HIDDEN) {
if (!getcontact(np, j))
}
}
}
- if (rnc == 0 && tnc == 0)
- continue;
if (rnc > 0) {
res[i] /= rnc * ally_factor;
}