From 445dfec9bcee9926d74305e4a80d5e79f77e343d Mon Sep 17 00:00:00 2001 From: Ron Koenderink Date: Fri, 28 Oct 2005 12:35:36 +0000 Subject: [PATCH] (NSC_CONST,castr,meta_flags): Add new flag NSC_CONST to castr. (ichr_ca,pchr_ca,intrchr_ca): Use it. --- include/nsc.h | 3 ++- src/lib/global/nsc.c | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/nsc.h b/include/nsc.h index f5efcd26..40183a79 100644 --- a/include/nsc.h +++ b/include/nsc.h @@ -84,7 +84,8 @@ typedef char packed_nsc_cat; enum { NSC_DEITY = bit(0), /* access restricted to deity */ - NSC_EXTRA = bit(1) /* computable from other selectors */ + NSC_EXTRA = bit(1), /* computable from other selectors */ + NSC_CONST = bit(2) /* field cannot be changed */ }; typedef unsigned char nsc_flags; diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c index 814216cc..f5f1d8e2 100644 --- a/src/lib/global/nsc.c +++ b/src/lib/global/nsc.c @@ -77,7 +77,7 @@ NSC_IELT("rad", "r", sfx, base, I_RAD) struct castr ichr_ca[] = { {NSC_STRING, 0, 0, offsetof(struct ichrstr, i_name), "name", EF_BAD}, - {NSC_INT, 0, 0, offsetof(struct ichrstr, i_mnem), "mnem", EF_BAD}, + {NSC_INT, NSC_CONST, 0, offsetof(struct ichrstr, i_mnem), "mnem", EF_BAD}, {NSC_SITYPE(i_type), 0, 0, offsetof(struct ichrstr, i_vtype), "vtype", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct ichrstr, i_value), "value", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct ichrstr, i_sell), "sell", EF_BAD}, @@ -88,7 +88,7 @@ struct castr ichr_ca[] = { struct castr pchr_ca[] = { {NSC_STRING, 0, 0, offsetof(struct pchrstr, p_name), "name", EF_BAD}, - {NSC_STRING, 0, 0, offsetof(struct pchrstr, p_sname), "sname", EF_BAD}, + {NSC_STRING, NSC_CONST, 0, offsetof(struct pchrstr, p_sname), "sname", EF_BAD}, {NSC_SITYPE(i_type), 0, MAXPRCON, offsetof(struct pchrstr, p_ctype), "ctype", EF_BAD}, {NSC_USHORT, 0, MAXPRCON, offsetof(struct pchrstr, p_camt), "camt", EF_BAD}, {NSC_SITYPE(i_type), 0, 0, offsetof(struct pchrstr, p_type), "type", EF_BAD}, @@ -148,7 +148,7 @@ struct castr sect_ca[] = { struct castr dchr_ca[] = { {NSC_STRING, 0, 0, offsetof(struct dchrstr, d_name), "name", EF_BAD}, - {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mnem), "mnem", EF_BAD}, + {NSC_INT, NSC_CONST, 0, offsetof(struct dchrstr, d_mnem), "mnem", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst", EF_BAD}, {NSC_INT, 0, 0, offsetof(struct dchrstr, d_flg), "flg", EF_BAD}, @@ -481,7 +481,7 @@ struct castr nat_ca[] = { }; struct castr intrchr_ca[] = { - {NSC_STRING, 0, 0, offsetof(struct sctintrins, in_name), "name", EF_BAD}, + {NSC_STRING, NSC_CONST, 0, offsetof(struct sctintrins, in_name), "name", EF_BAD}, {NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_lcms), "lcms", EF_BAD}, {NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_hcms), "hcms", EF_BAD}, {NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_dcost), "dcost", EF_BAD}, @@ -591,9 +591,10 @@ struct castr mdchr_ca[] = { struct lookup meta_flags[] = { {NSC_DEITY, "DEITY"}, {NSC_EXTRA, "EXTRA"}, + {NSC_CONST, "CONST"}, {0, ""} }; - + struct lookup meta_type[] = { {NSC_LONG, "d"}, {NSC_DOUBLE, "g"},