nsc: Replace NSC_EXTRA, NSC_CONST by enum ca_dump
struct castr ca_flag NSC_EXTRA was introduced in commit3e5c064(v4.2.18) to permit selectors that aren't in xdump. Flag NSC_CONST was introduced in commit445dfec, and put to use in commitd8422ca(both v4.3.0) to protect certain table elements that should not be changed in customized tables. Both flags apply only to xdump, not to other uses of struct castr, such as conditionals. Combining NSC_EXTRA | NSC_CONST makes no sense. I'll shortly need a way to keep selectors out of configuration tables for conditional selector and xdump command forward compatibility. Doing it as a third flag would add more nonsensical combinations. Convert the flags to a separate enum ca_dump instead: neither -> CA_DUMP NSC_CONST -> CA_DUMP_CONST NSC_EXTRA -> CA_DUMP_NONE Bonus: unlike the flags it replaces, ca_dump is not visible in xdump. Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
parent
9289eb0525
commit
dc58018cd7
9 changed files with 564 additions and 488 deletions
|
|
@ -601,8 +601,8 @@
|
|||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta sect 0
|
||||
Play#0 output Play#0 1 "owner" 5 0 0 8
|
||||
Play#0 output Play#0 1 "xloc" 9 4 0 -1
|
||||
Play#0 output Play#0 1 "yloc" 10 4 0 -1
|
||||
Play#0 output Play#0 1 "xloc" 9 0 0 -1
|
||||
Play#0 output Play#0 1 "yloc" 10 0 0 -1
|
||||
Play#0 output Play#0 1 "des" 4 0 0 18
|
||||
Play#0 output Play#0 1 "effic" 4 0 0 -1
|
||||
Play#0 output Play#0 1 "mobil" 4 0 0 -1
|
||||
|
|
@ -928,8 +928,8 @@
|
|||
Play#0 input xdump meta 14
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta realm 0
|
||||
Play#0 output Play#0 1 "cnum" 5 4 0 8
|
||||
Play#0 output Play#0 1 "realm" 7 4 0 -1
|
||||
Play#0 output Play#0 1 "cnum" 5 0 0 8
|
||||
Play#0 output Play#0 1 "realm" 7 0 0 -1
|
||||
Play#0 output Play#0 1 "xl" 9 0 0 -1
|
||||
Play#0 output Play#0 1 "xh" 9 0 0 -1
|
||||
Play#0 output Play#0 1 "yl" 10 0 0 -1
|
||||
|
|
@ -951,7 +951,7 @@
|
|||
Play#0 output Play#0 1 XDUMP meta item 0
|
||||
Play#0 output Play#0 1 "uid" 4 0 0 16
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 "mnem" 13 4 1 -1
|
||||
Play#0 output Play#0 1 "mnem" 13 0 1 -1
|
||||
Play#0 output Play#0 1 "power" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "sell" 8 0 0 -1
|
||||
|
|
@ -983,7 +983,7 @@
|
|||
Play#0 output Play#0 1 XDUMP meta sect-chr 0
|
||||
Play#0 output Play#0 1 "uid" 5 0 0 18
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 "mnem" 13 4 1 -1
|
||||
Play#0 output Play#0 1 "mnem" 13 0 1 -1
|
||||
Play#0 output Play#0 1 "terrain" 5 0 0 18
|
||||
Play#0 output Play#0 1 "prd" 8 0 0 17
|
||||
Play#0 output Play#0 1 "peffic" 8 0 0 -1
|
||||
|
|
@ -1131,7 +1131,7 @@
|
|||
Play#0 input xdump meta 24
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta infrastructure 0
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 "lcms" 5 0 0 -1
|
||||
Play#0 output Play#0 1 "hcms" 5 0 0 -1
|
||||
Play#0 output Play#0 1 "dcost" 5 0 0 -1
|
||||
|
|
@ -1149,7 +1149,7 @@
|
|||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta table 0
|
||||
Play#0 output Play#0 1 "uid" 8 0 0 26
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 27
|
||||
|
|
@ -1270,151 +1270,151 @@
|
|||
Play#0 input xdump meta 28
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta meta 0
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "type" 8 4 0 33
|
||||
Play#0 output Play#0 1 "flags" 8 12 0 32
|
||||
Play#0 output Play#0 1 "len" 7 4 0 -1
|
||||
Play#0 output Play#0 1 "table" 8 4 0 26
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 "type" 8 0 0 33
|
||||
Play#0 output Play#0 1 "flags" 8 8 0 32
|
||||
Play#0 output Play#0 1 "len" 7 0 0 -1
|
||||
Play#0 output Play#0 1 "table" 8 0 0 26
|
||||
Play#0 output Play#0 1 /5
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 29
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta agreement-status 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 30
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta land-chr-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 31
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta level 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 32
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta meta-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 33
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta meta-type 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 34
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta missions 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 35
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta nation-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 36
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta nation-rejects 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 37
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta nation-relationships 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 38
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta nation-status 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 39
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta nuke-chr-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 40
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta packing 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 41
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta page-headings 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 42
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta plague-stages 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 43
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta plane-chr-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 44
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta plane-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 45
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta resources 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 46
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta retreat-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 47
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta sector-navigation 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 48
|
||||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta ship-chr-flags 0
|
||||
Play#0 output Play#0 1 "value" 8 4 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 4 0 -1
|
||||
Play#0 output Play#0 1 "value" 8 0 0 -1
|
||||
Play#0 output Play#0 1 "name" 3 0 0 -1
|
||||
Play#0 output Play#0 1 /2
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta 49
|
||||
|
|
@ -1844,11 +1844,9 @@
|
|||
Play#0 command xdump
|
||||
Play#0 output Play#0 1 XDUMP meta-flags 0
|
||||
Play#0 output Play#0 1 1 "deity"
|
||||
Play#0 output Play#0 1 2 "extra"
|
||||
Play#0 output Play#0 1 4 "const"
|
||||
Play#0 output Play#0 1 8 "bits"
|
||||
Play#0 output Play#0 1 16 "hidden"
|
||||
Play#0 output Play#0 1 /5
|
||||
Play#0 output Play#0 1 /3
|
||||
Play#0 output Play#0 6 0 640
|
||||
Play#0 input xdump meta-type *
|
||||
Play#0 command xdump
|
||||
|
|
@ -2510,11 +2508,9 @@
|
|||
Play#1 command xdump
|
||||
Play#1 output Play#1 1 XDUMP meta-flags 0
|
||||
Play#1 output Play#1 1 1 "deity"
|
||||
Play#1 output Play#1 1 2 "extra"
|
||||
Play#1 output Play#1 1 4 "const"
|
||||
Play#1 output Play#1 1 8 "bits"
|
||||
Play#1 output Play#1 1 16 "hidden"
|
||||
Play#1 output Play#1 1 /5
|
||||
Play#1 output Play#1 1 /3
|
||||
Play#1 output Play#1 6 0 0
|
||||
Play#1 input xdump meta-type *
|
||||
Play#1 command xdump
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue