(dchrstr): Rename member d_flg to d_nav. Users changed.

diff --git a/include/sect.h b/include/sect.h
index 22e67c60588a899fd61d942fa274dfc316c7e63b..5cbaf28f17e896e08ed9bfdb4da9614975970ad3 100644 (file)
--- a/include/sect.h
+++ b/include/sect.h
@@ -94,7 +94,7 @@ struct dchrstr {
     int d_mnem;                        /* map symbol */
     int d_prd;                 /* product type */
     int d_mcst;                        /* movement cost */
-    int d_flg;                 /* movement flags */
+    int d_nav;                 /* navigation capability */
     i_packing d_pkg;           /* type of packaging in these sects */
     float d_ostr;              /* offensive strength */
     float d_dstr;              /* defensive strength */
@@ -107,7 +107,7 @@ struct dchrstr {
     char *d_name;              /* full name of sector type */
 };
 
-/* for d_flg */
+/* for d_nav */
 #define        NAVOK   1               /* ships can always navigate */
 #define        NAV_02  2               /* requires 2% effic to navigate */
 #define        NAV_60  3               /* requires 60% effic to navigate */

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 9dcb44eaf13daafb2fe9da39f6921d03d4d38380..7f8adbb98f5de351f0cb52dba6044ce320cf879c 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -167,7 +167,7 @@ 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_INT, 0, 0, offsetof(struct dchrstr, d_nav), "nav", EF_BAD /* FIXME */},
     {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},

diff --git a/src/lib/subs/shpsub.c b/src/lib/subs/shpsub.c
index 8b9270b9b0593687bbfa8164c5977cda6de3d046..f853e3ba9e29ca7b356360da8890f5d514f74484 100644 (file)
--- a/src/lib/subs/shpsub.c
+++ b/src/lib/subs/shpsub.c
@@ -370,7 +370,7 @@ shp_mess(s_char *str, struct mlist *mlp)
 int
 shp_check_nav(struct sctstr *sect)
 {
-    switch (dchr[sect->sct_type].d_flg & 03) {
+    switch (dchr[sect->sct_type].d_nav & 03) {
     case NAVOK:
        break;