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

2
src/lib/commands/xdump.c
View file

@ -204,7 +204,7 @@ xdvisible(int type, void *p)
case EF_LOST:
return gp->own != 0 && (gp->own == player->cnum || player->god);
case EF_NATION:
return ((struct natstr *)p)->nat_stat != 0
return ((struct natstr *)p)->nat_stat != STAT_UNUSED
&& (gp->own == player->cnum || player->god);
case EF_NEWS:
return ((struct nwsstr *)p)->nws_vrb != 0