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

10
src/lib/subs/wu.c
View file

@ -102,7 +102,7 @@ wu(natid from, natid to, char *format, ...)
np = getnatp(from);
if (update_pending)
return typed_wu(from, to, buf, TEL_UPDATE);
else if (np->nat_stat & STAT_GOD)
else if (np->nat_stat == STAT_GOD)
return typed_wu(from, to, buf, TEL_BULLETIN);
else
return typed_wu(from, to, buf, TEL_NORM);
@ -136,11 +136,8 @@ typed_wu(natid from, natid to, char *message, int type)
mailbox(box, to);
if (type != TEL_ANNOUNCE)
if ((np = getnatp(to)) == 0 ||
((np->nat_stat & STAT_NORM) == 0 &&
(np->nat_stat & STAT_SANCT) == 0)) {
if ((np = getnatp(to)) == 0 || np->nat_stat < STAT_SANCT)
return -1;
}
#if !defined(_WIN32)
if ((fd = open(box, O_WRONLY | O_APPEND, 0)) < 0) {
#else
@ -176,8 +173,7 @@ typed_wu(natid from, natid to, char *message, int type)
logerror("telegram 'write' to #%d failed to close.", to);
} else if (write_ok && type == TEL_ANNOUNCE) {
for (to = 0; NULL != (np = getnatp(to)); to++) {
if (!(np->nat_stat & STAT_NORM) &&
!(np->nat_stat & STAT_SANCT))
if (np->nat_stat < STAT_SANCT)
continue;
if (!player->god && (getrejects(from, np) & REJ_ANNO))
continue;