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

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

@ -90,15 +90,11 @@ rejectname(struct natstr *np, natid other)
char *
natstate(struct natstr *np)
{
if ((np->nat_stat & STAT_INUSE) == 0)
return "FREE";
if (np->nat_stat & STAT_GOD)
return "DEITY";
if (np->nat_stat & STAT_SANCT)
return "SANCTUARY";
if ((np->nat_stat & STAT_NORM) == 0)
return "VISITOR";
return "ACTIVE";
static char *stnam[] = {
/* must match nat_status */
"FREE", "VISITOR", "VISITOR", "SANCTUARY", "ACTIVE", "DEITY"
};
return stnam[np->nat_stat];
}
/* This returns the relations that np has with them */

6
src/lib/common/wantupd.c
View file

@ -129,8 +129,7 @@ demand_update_want(int *want, int *pop, int which)
for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
/* Only countries which are normal. */
/* Should probably include sanctuaries ..... */
if (((natp->nat_stat & NORM) == NORM) &&
((natp->nat_stat & GOD) != GOD)) {
if (natp->nat_stat == STAT_ACTIVE) {
totpop++;
if ((natp->nat_update & WUPD_WANT) == WUPD_WANT) {
totwant++;
@ -175,8 +174,7 @@ demand_check(void)
veto = 0;
for (cn = 1; 0 != (natp = getnatp(cn)); cn++) {
if (((natp->nat_stat & NORM) == NORM) &&
((natp->nat_stat & GOD) != GOD)) {
if (natp->nat_stat == STAT_ACTIVE) {
if (natp->nat_missed >= update_missed)
veto = cn;
}