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

12
src/lib/commands/coun.c
View file

@ -59,7 +59,7 @@ coun(void)
pr(" # last access %sstatus country name\n",
player->god ? "BTU " : "");
while (nxtitem(&ni, &nat)) {
if ((nat.nat_stat & STAT_INUSE) == 0)
if (nat.nat_stat == STAT_UNUSED)
continue;
coun_list(&nat);
}
@ -76,7 +76,7 @@ coun_list(struct natstr *natp)
if (getplayer(cn)
&& (player->god
|| (natp->nat_stat & STAT_GOD)
|| natp->nat_stat == STAT_GOD
|| cn == player->cnum || getrel(natp, player->cnum) == ALLIED))
pr(" Now logged on ");
else if (player->god) {
@ -94,13 +94,13 @@ coun_list(struct natstr *natp)
if (player->god)
pr(" %4d", natp->nat_btu);
if (natp->nat_stat & STAT_GOD)
if (natp->nat_stat == STAT_GOD)
status = "DEITY";
else if (natp->nat_stat & STAT_NEW)
else if (natp->nat_stat == STAT_NEW)
status = "New";
else if (natp->nat_stat & STAT_SANCT)
else if (natp->nat_stat == STAT_SANCT)
status = "Sanctuary";
else if (natp->nat_stat & STAT_NORM) {
else if (natp->nat_stat == STAT_ACTIVE) {
status = "Active";
if (!opt_HIDDEN || player->god) {
if (influx(natp))