From: Markus Armbruster <armbru@pond.sub.org>
Date: Thu, 5 Jan 2006 16:49:52 +0000 (+0000)
Subject: (mchrstr, lchrstr): Change element types of m_item[] and l_item[] to
X-Git-Tag: PZ5~225
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=b94b3b1b7ffd1fe912f5e5ce9ebe48f74ea5575a

(mchrstr, lchrstr): Change element types of m_item[] and l_item[] to
short, to match shp_item and lnd_item.
(mchr_ca, lchr_ca): Replace selector item by selectors for the items.
lchr_ca's item selector was incorrect and worked only by accident.
---

diff --git a/include/land.h b/include/land.h
index c5ecaccc0..461e6e0cf 100644
--- a/include/land.h
+++ b/include/land.h
@@ -99,7 +99,7 @@ struct lndstr {
 };
 
 struct lchrstr {
-    u_short l_item[I_MAX+1];	/* load limit */
+    short l_item[I_MAX+1];	/* load limit */
     char *l_name;		/* full name of type of land unit */
     int l_lcm;			/* units of lcm to build */
     int l_hcm;			/* units of hcm to build */
diff --git a/include/ship.h b/include/ship.h
index 9b9b730ce..a5895e46a 100644
--- a/include/ship.h
+++ b/include/ship.h
@@ -130,7 +130,7 @@ struct fltheadstr {
 };
 
 struct mchrstr {
-    u_short m_item[I_MAX+1];	/* load limit */
+    short m_item[I_MAX+1];	/* load limit */
     int m_lcm;			/* units of lcm to build */
     int m_hcm;			/* units of hcm to build */
     int m_armor;		/* how well armored it is */
diff --git a/src/lib/global/nsc.c b/src/lib/global/nsc.c
index c202e3a24..f797c6085 100644
--- a/src/lib/global/nsc.c
+++ b/src/lib/global/nsc.c
@@ -240,7 +240,7 @@ struct castr ship_ca[] = {
 
 struct castr mchr_ca[] = {
     {NSC_STRING, 0, 0, offsetof(struct mchrstr, m_name), "name", EF_BAD},
-    {NSC_USHORT, 0, I_MAX+1, offsetof(struct mchrstr, m_item), "item", EF_BAD},
+    NSC_IVEC(offsetof(struct mchrstr, m_item), ""),
     {NSC_INT, 0, 0, offsetof(struct mchrstr, m_lcm), "lcm", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct mchrstr, m_hcm), "hcm", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct mchrstr, m_armor), "armor", EF_BAD},
@@ -343,7 +343,7 @@ struct castr land_ca[] = {
 
 struct castr lchr_ca[] = {
     {NSC_STRING, 0, 0, offsetof(struct lchrstr, l_name), "name", EF_BAD},
-    {NSC_USHORT, 0, I_MAX+1, offsetof(struct mchrstr, m_item), "item", EF_BAD},
+    NSC_IVEC(offsetof(struct lchrstr, l_item), ""),
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_lcm), "lcm", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_hcm), "hcm", EF_BAD},
     {NSC_INT, 0, 0, offsetof(struct lchrstr, l_gun), "gun", EF_BAD},