empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(cou_ca, symbol_ca, mdchr_ca): Make all selectors NSC_CONST.

Browse source 
(empfile_ca): Make selector name NSC_CONST.
This commit is contained in:
Markus Armbruster 2006-02-10 19:12:10 +00:00
parent 8c8bf88730
commit fa63f87bc0
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/lib/global/nsc.c
View file

@ -534,10 +534,10 @@ struct castr nat_ca[] = {
}; };
struct castr cou_ca[] = { struct castr cou_ca[] = {
{NSC_NATID, 0, 0, fldoff(natstr, nat_cnum), "cnum", EF_NATION}, {NSC_NATID, NSC_CONST, 0, fldoff(natstr, nat_cnum), "cnum", EF_NATION},
{NSC_SITYPE(nat_status), 0, 0, fldoff(natstr, nat_stat), "stat", {NSC_SITYPE(nat_status), NSC_CONST, 0, fldoff(natstr, nat_stat), "stat",
EF_NATION_STATUS}, EF_NATION_STATUS},
{NSC_STRINGY, 0, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD}, {NSC_STRINGY, NSC_CONST, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD} {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
}; };
@ -575,13 +575,17 @@ struct castr rpt_ca[] = {
struct castr empfile_ca[] = { struct castr empfile_ca[] = {
{NSC_INT, 0, 0, offsetof(struct empfile, uid), "uid", EF_TABLE}, {NSC_INT, 0, 0, offsetof(struct empfile, uid), "uid", EF_TABLE},
{NSC_STRING, 0, 0, offsetof(struct empfile, name), "name", EF_BAD}, {NSC_STRING, NSC_CONST, 0, offsetof(struct empfile, name), "name", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD} {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
}; };
struct castr symbol_ca[] = { struct castr symbol_ca[] = {
{NSC_INT, 0, 0, offsetof(struct symbol, value), "value", EF_BAD}, /*
{NSC_STRING, 0, 0, offsetof(struct symbol, name), "name", EF_BAD}, * value is is const because it has to match what is compiled into
* the server. name is const because clients key on it.
*/
{NSC_INT, NSC_CONST, 0, offsetof(struct symbol, value), "value", EF_BAD},
{NSC_STRING, NSC_CONST, 0, offsetof(struct symbol, name), "name", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD} {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
}; };
@ -655,12 +659,17 @@ struct symbol nuke_chr_flags[] = {
struct castr mdchr_ca[] = { struct castr mdchr_ca[] = {
/* no need for uid */ /* no need for uid */
{NSC_STRING, 0, 0, offsetof(struct castr, ca_name), "name", EF_BAD}, /* name must come first, clients may rely on it */
{NSC_CHAR, 0, 0, offsetof(struct castr, ca_type), "type", EF_META_TYPE}, {NSC_STRING, NSC_CONST, 0, offsetof(struct castr, ca_name), "name",
{NSC_UCHAR, NSC_BITS, 0, offsetof(struct castr, ca_flags), "flags", EF_BAD},
EF_META_FLAGS}, {NSC_CHAR, NSC_CONST, 0, offsetof(struct castr, ca_type), "type",
{NSC_USHORT, 0, 0, offsetof(struct castr, ca_len), "len", EF_BAD}, EF_META_TYPE},
{NSC_INT, 0, 0, offsetof(struct castr, ca_table), "table", EF_BAD}, {NSC_UCHAR, NSC_CONST | NSC_BITS, 0, offsetof(struct castr, ca_flags),
"flags", EF_META_FLAGS},
{NSC_USHORT, NSC_CONST, 0, offsetof(struct castr, ca_len), "len",
EF_BAD},
{NSC_INT, NSC_CONST, 0, offsetof(struct castr, ca_table), "table",
EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD} {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
}; };
@ -798,7 +807,7 @@ struct symbol resources[] = {
{0, NULL} {0, NULL}
}; };
struct symbol sector_navigation[] = { /* for d_nav */ struct symbol sector_navigation[] = {
{NAV_NONE, "land"}, {NAV_NONE, "land"},
{NAVOK, "sea"}, {NAVOK, "sea"},
{NAV_02, "harbor"}, {NAV_02, "harbor"},