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

15
src/lib/commands/powe.c
View file

@ -144,7 +144,7 @@ powe(void)
continue;
}
natp2 = getnatp(pow.p_nation);
if (natp2->nat_stat & STAT_GOD)
if (natp2->nat_stat == STAT_GOD)
continue;
if (use_targets && !targets[pow.p_nation])
continue;
@ -288,12 +288,7 @@ gen_power(void)
for (i = 1; NULL != (natp = getnatp(i)); i++) {
pow = &powbuf[i];
pow->p_nation = i;
if ((natp->nat_stat & STAT_INUSE) == 0 ||
(natp->nat_stat & STAT_NORM) == 0) {
pow->p_power = 0.;
continue;
}
if (natp->nat_stat & STAT_GOD) {
if (natp->nat_stat != STAT_ACTIVE) {
pow->p_power = 0.;
continue;
}
@ -397,11 +392,11 @@ set_target(s_char *p, int *targets)
target = cnumb(p);
if (target > 0 && target < MAXNOC && (natp = getnatp(target))) {
if (natp->nat_stat & STAT_GOD) {
if (natp->nat_stat == STAT_GOD) {
pr("Country #%d is a deity country\n", target);
} else if (!(natp->nat_stat & STAT_INUSE)) {
} else if (natp->nat_stat == STAT_UNUSED) {
pr("Country #%d is not in use\n", target);
} else if (!(natp->nat_stat & STAT_NORM)) {
} else if (natp->nat_stat != STAT_ACTIVE) {
pr("Country #%d is not a normal country\n", target);
} else {
targets[target] = 1;