(tchrstr, tchr_ca): Remove, use struct symbol and symbol_ca. Users

changed.
(tchr, treaty_flags): Rename for consistency with other flags.

src/lib/global/file.c

@@ -122,9 +122,9 @@ struct empfile empfile[] = {
     {EF_NEWS_CHR, "news chr", NULL, EFF_CFG,
      sizeof(rpt[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)rpt, 0, rpt_ca},
-    {EF_TREATY_CHR, "treaty chr", NULL, EFF_CFG,
-     sizeof(tchr[0]), NULL, NULL, NULL,
-     -1, -1, 0, 0, (char *)tchr, 0, tchr_ca},
+    {EF_TREATY_CHR, "treaty flags", NULL, EFF_CFG,
+     sizeof(treaty_flags[0]), NULL, NULL, NULL,
+     -1, -1, 0, 0, (char *)treaty_flags, 0, symbol_ca},
     {EF_ITEM, "item", NULL, EFF_CFG,
      sizeof(ichr[0]), NULL, NULL, NULL,
      -1, -1, 0, 0, (char *)ichr, 0, ichr_ca},

src/lib/global/nsc.c

@@ -373,12 +373,6 @@ struct castr treaty_ca[] = {
     {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
 };
 
-struct castr tchr_ca[] = {
-    {NSC_STRING, 0, 0, offsetof(struct tchrstr, t_name), "name", EF_BAD},
-    {NSC_INT, 0, 0, offsetof(struct tchrstr, t_cond), "cond", EF_BAD},
-    {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
-};
-
 struct castr loan_ca[] = {
     {NSC_NATID, 0, 0, fldoff(lonstr, l_loner), "loaner", EF_BAD},
     {NSC_SHORT, 0, 0, fldoff(lonstr, l_uid), "uid", EF_BAD},

src/lib/global/treaty.c

@@ -33,9 +33,10 @@
  */
 
 #include "misc.h"
+#include "nsc.h"
 #include "treaty.h"
 
-struct tchrstr tchr[] = {
+struct symbol treaty_flags[] = {
     {LNDATT, "no attacks on any land units"},
     {SEAATT, "no attacks on any ships"},
     {SEAFIR, "no shelling any ships"},
@@ -47,5 +48,5 @@ struct tchrstr tchr[] = {
     {NEWPLN, "no building planes"},
     {NEWLND, "no building land units"},
     {TRTENL, "no enlistment"},
-    {0, 0}
+    {0, NULL}
 };