COPYING duplicates information from README. Remove. Move GPL from

[empserver] / src / lib / global / nsc.c

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 1f46de487d29960ed729609bef4cd4ca78c37e1b..16ee98f1dc422da5498fe50b4842f43c20b031b3 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -167,7 +167,8 @@ struct castr dchr_ca[] = {
     {NSC_INT, NSC_CONST, 0, offsetof(struct dchrstr, d_mnem), "mnem", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_PRODUCT},
     {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst", EF_BAD},
-    {NSC_INT, 0, 0, offsetof(struct dchrstr, d_flg), "flg", EF_BAD /* FIXME */},
+    {NSC_SITYPE(d_navigation), 0, 0, offsetof(struct dchrstr, d_nav), "nav",
+     EF_SECTOR_NAVIGATION},
     {NSC_SITYPE(i_packing), 0, 0, offsetof(struct dchrstr, d_pkg), "pkg",
      EF_PACKING},
     {NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_ostr), "ostr", EF_BAD},
@@ -400,7 +401,6 @@ struct castr nchr_ca[] = {
 };
 
 struct castr treaty_ca[] = {
-    /* FIXME disclose only to cna, cnb */
     {NSC_SHORT, 0, 0, fldoff(trtstr, trt_uid), "uid", EF_TREATY},
     {NSC_NATID, 0, 0, fldoff(trtstr, trt_cna), "cna", EF_NATION},
     {NSC_NATID, 0, 0, fldoff(trtstr, trt_cnb), "cnb", EF_NATION},
@@ -415,7 +415,6 @@ struct castr treaty_ca[] = {
 };
 
 struct castr loan_ca[] = {
-    /* FIXME disclose only to loaner, loanee and partially to all if signed */
     {NSC_SHORT, 0, 0, fldoff(lonstr, l_uid), "uid", EF_LOAN},
     {NSC_NATID, 0, 0, fldoff(lonstr, l_loner), "loaner", EF_NATION},
     {NSC_NATID, 0, 0, fldoff(lonstr, l_lonee), "loanee", EF_NATION},
@@ -431,7 +430,6 @@ struct castr loan_ca[] = {
 };
 
 struct castr news_ca[] = {
-    /* FIXME if HIDDEN disclose requires contact with actor and victim, and new */
     {NSC_SHORT, 0, 0, fldoff(nwsstr, nws_uid), "uid", EF_NEWS},
     {NSC_NATID, 0, 0, fldoff(nwsstr, nws_ano), "actor", EF_NATION},
     {NSC_CHAR, 0, 0, fldoff(nwsstr, nws_vrb), "action", EF_NEWS_CHR},
@@ -515,7 +513,6 @@ struct castr nat_ca[] = {
      EF_BAD},
     {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_HLEV]), "happiness",
      EF_BAD},
-    /* FIXME nat_b[] */
     {NSC_SHORT, 0, MAXNOC, fldoff(natstr, nat_relate), "relations",
      EF_NATION_RELATIONS},
     {NSC_UCHAR, NSC_DEITY, MAXNOC, fldoff(natstr, nat_contact), "contacts",
@@ -526,14 +523,22 @@ struct castr nat_ca[] = {
     {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
 };
 
+struct castr cou_ca[] = {
+    {NSC_NATID, 0, 0, fldoff(natstr, nat_cnum), "cnum", EF_NATION},
+    {NSC_CHAR, 0, 0, fldoff(natstr, nat_stat), "stat",
+     EF_NATION_STATUS},
+    {NSC_STRINGY, 0, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD},
+    {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
+};
+
 struct castr realm_ca[] = {
     {NSC_SHORT, 0, 0, fldoff(realmstr, r_uid), "uid", EF_REALM},
     {NSC_NATID, 0, 0, fldoff(realmstr, r_cnum), "cnum", EF_NATION},
-    {NSC_USHORT, 0, 0, fldoff(realmstr, r_realm), "realm"},
-    {NSC_SHORT, 0, 0, fldoff(realmstr, r_xl), "xl"},
-    {NSC_SHORT, 0, 0, fldoff(realmstr, r_xh), "xh"},
-    {NSC_SHORT, 0, 0, fldoff(realmstr, r_yl), "yl"},
-    {NSC_SHORT, 0, 0, fldoff(realmstr, r_yh), "yh"},
+    {NSC_USHORT, 0, 0, fldoff(realmstr, r_realm), "realm", EF_BAD},
+    {NSC_SHORT, 0, 0, fldoff(realmstr, r_xl), "xl", EF_BAD},
+    {NSC_SHORT, 0, 0, fldoff(realmstr, r_xh), "xh", EF_BAD},
+    {NSC_SHORT, 0, 0, fldoff(realmstr, r_yl), "yl", EF_BAD},
+    {NSC_SHORT, 0, 0, fldoff(realmstr, r_yh), "yh", EF_BAD},
     {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
 };
 
@@ -777,3 +782,11 @@ struct symbol resources[] = {
     {offsetof(struct sctstr, sct_uran), "uran"},
     {0, NULL}
 };
+
+struct symbol sector_navigation[] = { /* for d_nav */
+    {NAV_NONE, "land"},
+    {NAVOK, "sea"},
+    {NAV_02, "harbor"},
+    {NAV_60, "bridge"},
+    {0, NULL}
+};