Change nation status from bits to a simple enum:
(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:
parent
41c2c27376
commit
8b16c31223
35 changed files with 113 additions and 151 deletions
|
@ -748,7 +748,7 @@ docountry(s_char op, int arg, s_char *p, float farg, natid nat,
|
|||
np->nat_yorg = newy;
|
||||
break;
|
||||
case 's':
|
||||
np->nat_stat = (s_char)errcheck(arg, 0, STAT_NEW);
|
||||
np->nat_stat = (nat_status)errcheck(arg, STAT_UNUSED, STAT_GOD);
|
||||
break;
|
||||
case 'u':
|
||||
arg = errcheck(arg, 0, m_m_p_d);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue