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

Change nation status from bits to a simple enum:

Browse source 
(nat_status, STAT_UNUSED, STAT_VIS, STAT_ACTIVE): New.
(STAT_NEW, STAT_SANCT, STAT_GOD): Change into nat_status members.
(STAT_INUSE, STAT_NORM): Remove.
(natstr): Use new nat_status for nat_stat.
    New value       Old value
    STAT_UNUSED     0
    STAT_NEW        STAT_INUSE | STAT_NEW
    STAT_VIS        STAT_INUSE
    STAT_SANCT      STAT_INUSE | STAT_SANCT
    STAT_ACTIVE     STAT_INUSE | STAT_NORM
    STAT_GOD        STAT_INUSE | STAT_NORM | STAT_GOD
Users changed.
This commit is contained in:
Markus Armbruster 2006-01-04 22:49:42 +00:00
parent 41c2c27376
commit 8b16c31223
35 changed files with 113 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,7 @@ prod_nat(int etu)
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
@ -190,7 +190,7 @@ prod_nat(int etu)
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];
@ -241,21 +241,21 @@ 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_INUSE) == 0)
if (np->nat_stat == STAT_UNUSED)
continue;
if (np->nat_stat & STAT_GOD)
if (np->nat_stat == STAT_GOD)
continue;
if (np->nat_stat == VIS)
if (np->nat_stat == STAT_VIS)
continue;
rnc = tnc = 0;
for (j = 0; NULL != (other = getnatp(j)); j++) {
if (j == i)
continue;
if (other->nat_stat & STAT_GOD)
if (other->nat_stat == STAT_GOD)
continue;
if (other->nat_stat == VIS)
if (other->nat_stat == STAT_VIS)
continue;
if ((other->nat_stat & STAT_INUSE) == 0)
if (other->nat_stat == STAT_UNUSED)
continue;
if (opt_HIDDEN) {
if (!getcontact(np, j))