(lndchr): Document that members l_gun and l_shell are unused.

(lchr_ca): Remove selectors g_build and s_build.  Update land.config.

diff --git a/include/land.h b/include/land.h
index 5294eab1ea9ab0128d177844efcc7682407e5a39..b3d38dc579686a660bdc46aa100cca2965fbb672 100644 (file)
--- a/include/land.h
+++ b/include/land.h
@@ -104,8 +104,8 @@ struct lchrstr {
     int l_lcm;                 /* units of lcm to build */
     int l_hcm;                 /* units of hcm to build */
     int l_mil;                 /* how many mil it takes to build */
-    int l_gun;                 /* how many guns it takes to build */
-    int l_shell;               /* how many shells it takes to build */
+    int l_gun;                 /* how many guns it takes to build (unused) */
+    int l_shell;               /* #shells it takes to build (unused) */
     int l_tech;                        /* tech required to build */
     int l_cost;                        /* how much it costs to build */
     float l_att;               /* attack multiplier */

diff --git a/src/lib/global/land.config b/src/lib/global/land.config
index 17075648e698a02634b63e968a11e2f62e9badc0..f89fddb26e861243db437f14f5051eefd5e84e70 100644 (file)
--- a/src/lib/global/land.config
+++ b/src/lib/global/land.config
@@ -40,29 +40,29 @@
 # document them all.
 
 config land-chr
-type name                 l_b h_b g_b s_b tech cost ...
- 0  "cav  cavalry"         10   5   0   0   30  500
- 1  "linf light infantry"   8   4   0   0   40  300
- 2  "inf  infantry"        10   5   0   0   50  500
- 3  "mtif motor inf"       15  10   0   0  190  400
- 4  "mif  mech inf"        15  10   0   0  190  800
- 5  "mar  marines"         10   5   0   0  140 1000
- 6  "sup  supply"          10   5   0   0   50  500
- 7  "tra  train"          100  50   0   0   40 3500
- 8  "spy  infiltrator"     10   5   0   0   40  750
- 9  "com  commando"        10   5   0   0   55 1500
-10  "aau  aa unit"         20  10   0   0   70  500
-11  "art  artillery"       20  10   0   0   35  800
-12  "lat  lt artillery"    20  10   0   0   70  500
-13  "hat  hvy artillery"   40  20   0   0  100  800
-14  "mat  mech artillery"  20  10   0   0  200 1000
-15  "eng  engineer"        10   5   0   0  130 3000
-16  "meng mech engineer"   10   5   0   0  260 4500
-17  "lar  lt armor"        10   5   0   0  150  600
-18  "har  hvy armor"       20  10   0   0  120  500
-19  "arm  armor"           20  10   0   0  170 1000
-20  "sec  security"        10   5   0   0  170  600
-21  "rad  radar unit"      10   5   0   0  270 1000
+type name                 l_b h_b tech cost ...
+ 0  "cav  cavalry"         10   5   30  500
+ 1  "linf light infantry"   8   4   40  300
+ 2  "inf  infantry"        10   5   50  500
+ 3  "mtif motor inf"       15  10  190  400
+ 4  "mif  mech inf"        15  10  190  800
+ 5  "mar  marines"         10   5  140 1000
+ 6  "sup  supply"          10   5   50  500
+ 7  "tra  train"          100  50   40 3500
+ 8  "spy  infiltrator"     10   5   40  750
+ 9  "com  commando"        10   5   55 1500
+10  "aau  aa unit"         20  10   70  500
+11  "art  artillery"       20  10   35  800
+12  "lat  lt artillery"    20  10   70  500
+13  "hat  hvy artillery"   40  20  100  800
+14  "mat  mech artillery"  20  10  200 1000
+15  "eng  engineer"        10   5  130 3000
+16  "meng mech engineer"   10   5  260 4500
+17  "lar  lt armor"        10   5  150  600
+18  "har  hvy armor"       20  10  120  500
+19  "arm  armor"           20  10  170 1000
+20  "sec  security"        10   5  170  600
+21  "rad  radar unit"      10   5  270 1000
 /config
 
 config land-chr

diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index 9442c9c9ffef9631c1ba747a31dc3c1c6ed3df39..fb99a8266b8f70924f763edca107b9a44bfe2fd5 100644 (file)
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -356,8 +356,6 @@ struct castr lchr_ca[] = {
     NSC_IVEC(offsetof(struct lchrstr, l_item), ""),
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_lcm), "l_build", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_hcm), "h_build", EF_BAD},
-    {NSC_INT, 0, 0, offsetof(struct lchrstr, l_gun), "g_build", EF_BAD},
-    {NSC_INT, 0, 0, offsetof(struct lchrstr, l_shell), "s_build", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_tech), "tech", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_cost), "cost", EF_BAD},
     {NSC_FLOAT, 0, 0, offsetof(struct lchrstr, l_att), "att", EF_BAD},