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/add.c
View file

@ -68,7 +68,7 @@ add(void)
struct lndstr land;
for (freecn = 0; NULL != (natp = getnatp(freecn)); freecn++) {
if ((natp->nat_stat & STAT_INUSE) == 0)
if (natp->nat_stat == STAT_UNUSED)
break;
}
if (freecn < MAXNOC)
@ -111,19 +111,19 @@ add(void)
return RET_SYN;
switch (*p) {
case 'v':
stat = STAT_INUSE;
stat = STAT_VIS;
break;
case 'n':
stat = STAT_NEW | STAT_INUSE;
stat = STAT_NEW;
break;
case 'a':
stat = STAT_NORM | STAT_INUSE;
stat = STAT_ACTIVE;
break;
case 'g':
stat = STAT_GOD | STAT_NORM | STAT_INUSE;
stat = STAT_GOD;
break;
case 'd':
stat = 0;
stat = STAT_UNUSED;
break;
default:
pr("Illegal status\n");
@ -189,8 +189,7 @@ add(void)
}
}
if ((natp->nat_stat & (STAT_INUSE | STAT_NORM | STAT_GOD)) ==
STAT_INUSE) {
if (natp->nat_stat == STAT_NEW || natp->nat_stat == STAT_VIS) {
*natp->nat_hostaddr = '\0';
*natp->nat_hostname = '\0';
*natp->nat_userid = '\0';