(dchr): Use NAV_NONE.

diff --git a/src/lib/global/sect.c b/src/lib/global/sect.c
index c09e479c3447aef3e9b254faf6dc1a4c7c4a379e..4c6e1427a5a3ab8dfb487e04a779ca3b3b9b196b 100644 (file)
--- a/src/lib/global/sect.c
+++ b/src/lib/global/sect.c
@@ -44,46 +44,46 @@
 #include "product.h"
 
 struct dchrstr bigcity_dchr = {
-    SCT_CAPIT,   'c',       0, 2, NAV_02, UPKG, 1.0, 2.0,   30, 0, 10, 1, 2, 999, "city"
+    SCT_CAPIT,   'c',       0, 2,  NAV_02,   UPKG, 1.0, 2.0,   30, 0, 10, 1, 2, 999, "city"
 };
 
 struct dchrstr dchr[] = {
-    /*          mnem prd     mcst  flg    pkg  ostr dstr value  $ bld lcm hcm maxpop name */
-    {SCT_WATER,  '.',       0, 0,  NAVOK, NPKG, 0.0,  0.0,   0, -1, 0, 0, 0,   0, "sea"},
-    {SCT_MOUNT,  '^', P_MDUST, 25,     0, NPKG, 1.0,  4.0,   5, -1, 1, 0, 0,  99, "mountain"},
-    {SCT_SANCT,  's',       0, 0,      0, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 999, "sanctuary"},
-    {SCT_WASTE,  '\\',      0, 0,      0, NPKG, 0.0, 99.0,   0, -1, 0, 0, 0,   0, "wasteland"},
-    {SCT_RURAL,  '-',       0, 3,      0, NPKG, 1.0,  2.0,   1,  0, 0, 0, 0, 999, "wilderness"},
-    {SCT_CAPIT,  'c',       0, 2,      0, NPKG, 1.0,  2.0,  30,  0, 1, 0, 0, 999, "capital"},
-    {SCT_URAN,   'u', P_URAN,  2,      0, NPKG, 1.0,  2.0,  15,  0, 1, 0, 0, 999, "uranium mine"},
-    {SCT_PARK,   'p', P_HLEV,  2,      0, NPKG, 1.0,  1.5,   5,  0, 1, 0, 0, 999, "park"},
-    {SCT_ARMSF,  'd', P_GUN,   2,      0, NPKG, 1.0,  1.5,   7,  0, 1, 0, 0, 999, "defense plant"},
-    {SCT_AMMOF,  'i', P_SHELL, 2,      0, NPKG, 1.0,  1.5,   6,  0, 1, 0, 0, 999, "shell industry"},
-    {SCT_MINE,   'm', P_IRON,  2,      0, NPKG, 1.0,  2.0,   5,  0, 1, 0, 0, 999, "mine"},
-    {SCT_GMINE,  'g', P_DUST,  2,      0, NPKG, 1.0,  2.0,   8,  0, 1, 0, 0, 999, "gold mine"},
-    {SCT_HARBR,  'h',       0, 2, NAV_02, WPKG, 1.0,  1.5,  12,  0, 1, 0, 0, 999, "harbor"},
-    {SCT_WAREH,  'w',      0, 2,      0, WPKG, 1.0,  1.5,   7,  0, 1, 0, 0, 999, "warehouse"},
-    {SCT_AIRPT,  '*',      0, 2,      0, NPKG, 1.0,  1.25, 12,  0, 1, 0, 0, 999, "airfield"},
-    {SCT_AGRI,   'a', P_FOOD,  2,      0, NPKG, 1.0,  1.5,   2,  0, 1, 0, 0, 999, "agribusiness"},
-    {SCT_OIL,    'o', P_OIL,   2,      0, NPKG, 1.0,  1.5,   5,  0, 1, 0, 0, 999, "oil field"},
-    {SCT_LIGHT,  'j', P_LCM,   2,      0, NPKG, 1.0,  1.5,   3,  0, 1, 0, 0, 999, "light manufacturing"},
-    {SCT_HEAVY,  'k', P_HCM,   2,      0, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "heavy manufacturing"},
-    {SCT_FORTR,  'f',       0, 2,      0, NPKG, 2.0,  4.0,  10,  0, 5, 0, 1, 999, "fortress"},
-    {SCT_TECH,   't', P_TLEV,  2,      0, NPKG, 1.0,  1.5,  10,  0, 1, 0, 0, 999, "technical center"},
-    {SCT_RSRCH,  'r', P_RLEV,  2,      0, NPKG, 1.0,  1.5,   9,  0, 1, 0, 0, 999, "research lab"},
-    {SCT_NUKE,   'n',       0, 2,      0, NPKG, 1.0,  2.0,  10,  0, 1, 0, 0, 999, "nuclear plant"},
-    {SCT_LIBR,   'l', P_ELEV,  2,      0, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "library/school"},
-    {SCT_HIWAY,  '+',      0, 1,      0, NPKG, 1.0,  1.0,   3,  0, 1, 0, 0, 999, "highway"},
-    {SCT_RADAR,  ')',      0, 2,      0, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "radar installation"},
-    {SCT_HEADQ,  '!',      0, 2,      0, NPKG, 1.0,  1.5,  12,  0, 1, 0, 0, 999, "headquarters"},
-    {SCT_BHEAD,  '#',      0, 1,      0, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "bridge head"},
-    {SCT_BSPAN,  '=',      0, 1, NAV_60, NPKG, 1.0,  1.0,   5, -1, 1, 0, 0, 999, "bridge span"},
-    {SCT_BANK,   'b', P_BAR,   2,      0, BPKG, 1.0,  2.25, 10,  0, 1, 0, 0, 999, "bank"},
-    {SCT_REFINE, '%', P_PETROL, 2,     0, NPKG, 1.0,  1.5,   2,  0, 1, 0, 0, 999, "refinery"},
-    {SCT_ENLIST, 'e',      0, 2,      0, NPKG, 1.0,  2.0,   7,  0, 1, 0, 0, 999, "enlistment center"},
-    {SCT_PLAINS, '~',      0, 2,      0, NPKG, 1.0,  1.5,   1, -1, 1, 0, 0,  49, "plains"},
-    {SCT_BTOWER, '@',      0, 1,      0, NPKG, 1.0,  1.5,   4, -1, 1, 0, 0, 999, "bridge tower"},
-    {0, 0, 0, 0, 0, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL},
+    /*          mnem prd     mcst  flg       pkg  ostr dstr value  $ bld lcm hcm maxpop name */
+    {SCT_WATER,  '.',       0, 0,  NAVOK,    NPKG, 0.0,  0.0,   0, -1, 0, 0, 0,   0, "sea"},
+    {SCT_MOUNT,  '^', P_MDUST, 25, NAV_NONE, NPKG, 1.0,  4.0,   5, -1, 1, 0, 0,  99, "mountain"},
+    {SCT_SANCT,  's',       0, 0,  NAV_NONE, NPKG, 0.0, 99.0, 127, -1, 0, 0, 0, 999, "sanctuary"},
+    {SCT_WASTE,  '\\',      0, 0,  NAV_NONE, NPKG, 0.0, 99.0,   0, -1, 0, 0, 0,   0, "wasteland"},
+    {SCT_RURAL,  '-',       0, 3,  NAV_NONE, NPKG, 1.0,  2.0,   1,  0, 0, 0, 0, 999, "wilderness"},
+    {SCT_CAPIT,  'c',       0, 2,  NAV_NONE, NPKG, 1.0,  2.0,  30,  0, 1, 0, 0, 999, "capital"},
+    {SCT_URAN,   'u', P_URAN,  2,  NAV_NONE, NPKG, 1.0,  2.0,  15,  0, 1, 0, 0, 999, "uranium mine"},
+    {SCT_PARK,   'p', P_HLEV,  2,  NAV_NONE, NPKG, 1.0,  1.5,   5,  0, 1, 0, 0, 999, "park"},
+    {SCT_ARMSF,  'd', P_GUN,   2,  NAV_NONE, NPKG, 1.0,  1.5,   7,  0, 1, 0, 0, 999, "defense plant"},
+    {SCT_AMMOF,  'i', P_SHELL, 2,  NAV_NONE, NPKG, 1.0,  1.5,   6,  0, 1, 0, 0, 999, "shell industry"},
+    {SCT_MINE,   'm', P_IRON,  2,  NAV_NONE, NPKG, 1.0,  2.0,   5,  0, 1, 0, 0, 999, "mine"},
+    {SCT_GMINE,  'g', P_DUST,  2,  NAV_NONE, NPKG, 1.0,  2.0,   8,  0, 1, 0, 0, 999, "gold mine"},
+    {SCT_HARBR,  'h',       0, 2,  NAV_02,   WPKG, 1.0,  1.5,  12,  0, 1, 0, 0, 999, "harbor"},
+    {SCT_WAREH,  'w',      0, 2,  NAV_NONE, WPKG, 1.0,  1.5,   7,  0, 1, 0, 0, 999, "warehouse"},
+    {SCT_AIRPT,  '*',      0, 2,  NAV_NONE, NPKG, 1.0,  1.25, 12,  0, 1, 0, 0, 999, "airfield"},
+    {SCT_AGRI,   'a', P_FOOD,  2,  NAV_NONE, NPKG, 1.0,  1.5,   2,  0, 1, 0, 0, 999, "agribusiness"},
+    {SCT_OIL,    'o', P_OIL,   2,  NAV_NONE, NPKG, 1.0,  1.5,   5,  0, 1, 0, 0, 999, "oil field"},
+    {SCT_LIGHT,  'j', P_LCM,   2,  NAV_NONE, NPKG, 1.0,  1.5,   3,  0, 1, 0, 0, 999, "light manufacturing"},
+    {SCT_HEAVY,  'k', P_HCM,   2,  NAV_NONE, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "heavy manufacturing"},
+    {SCT_FORTR,  'f',       0, 2,  NAV_NONE, NPKG, 2.0,  4.0,  10,  0, 5, 0, 1, 999, "fortress"},
+    {SCT_TECH,   't', P_TLEV,  2,  NAV_NONE, NPKG, 1.0,  1.5,  10,  0, 1, 0, 0, 999, "technical center"},
+    {SCT_RSRCH,  'r', P_RLEV,  2,  NAV_NONE, NPKG, 1.0,  1.5,   9,  0, 1, 0, 0, 999, "research lab"},
+    {SCT_NUKE,   'n',       0, 2,  NAV_NONE, NPKG, 1.0,  2.0,  10,  0, 1, 0, 0, 999, "nuclear plant"},
+    {SCT_LIBR,   'l', P_ELEV,  2,  NAV_NONE, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "library/school"},
+    {SCT_HIWAY,  '+',      0, 1,  NAV_NONE, NPKG, 1.0,  1.0,   3,  0, 1, 0, 0, 999, "highway"},
+    {SCT_RADAR,  ')',      0, 2,  NAV_NONE, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "radar installation"},
+    {SCT_HEADQ,  '!',      0, 2,  NAV_NONE, NPKG, 1.0,  1.5,  12,  0, 1, 0, 0, 999, "headquarters"},
+    {SCT_BHEAD,  '#',      0, 1,  NAV_NONE, NPKG, 1.0,  1.5,   4,  0, 1, 0, 0, 999, "bridge head"},
+    {SCT_BSPAN,  '=',      0, 1,  NAV_60,   NPKG, 1.0,  1.0,   5, -1, 1, 0, 0, 999, "bridge span"},
+    {SCT_BANK,   'b', P_BAR,   2,  NAV_NONE, BPKG, 1.0,  2.25, 10,  0, 1, 0, 0, 999, "bank"},
+    {SCT_REFINE, '%', P_PETROL, 2, NAV_NONE, NPKG, 1.0,  1.5,   2,  0, 1, 0, 0, 999, "refinery"},
+    {SCT_ENLIST, 'e',      0, 2,  NAV_NONE, NPKG, 1.0,  2.0,   7,  0, 1, 0, 0, 999, "enlistment center"},
+    {SCT_PLAINS, '~',      0, 2,  NAV_NONE, NPKG, 1.0,  1.5,   1, -1, 1, 0, 0,  49, "plains"},
+    {SCT_BTOWER, '@',      0, 1,  NAV_NONE, NPKG, 1.0,  1.5,   4, -1, 1, 0, 0, 999, "bridge tower"},
+    {0, 0, 0, 0, NAV_NONE, IPKG, 0, 0, 0, 0, 0, 0, 0, 0, NULL},
 };
 
 struct sctintrins intrchr[] = {