empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(mchrstr, lchrstr): Change element types of m_item[] and l_item[] to

Browse source 
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.
This commit is contained in:
Markus Armbruster 2006-01-05 16:49:52 +00:00
parent f6987ca3ef
commit b94b3b1b7f
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/land.h
View file

@ -99,7 +99,7 @@ struct lndstr {
}; };
struct lchrstr { 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 */ char *l_name; /* full name of type of land unit */
int l_lcm; /* units of lcm to build */ int l_lcm; /* units of lcm to build */
int l_hcm; /* units of hcm to build */ int l_hcm; /* units of hcm to build */

2
include/ship.h
View file

@ -130,7 +130,7 @@ struct fltheadstr {
}; };
struct mchrstr { 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_lcm; /* units of lcm to build */
int m_hcm; /* units of hcm to build */ int m_hcm; /* units of hcm to build */
int m_armor; /* how well armored it is */ int m_armor; /* how well armored it is */

4
src/lib/global/nsc.c
View file

@ -240,7 +240,7 @@ struct castr ship_ca[] = {
struct castr mchr_ca[] = { struct castr mchr_ca[] = {
{NSC_STRING, 0, 0, offsetof(struct mchrstr, m_name), "name", EF_BAD}, {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_lcm), "lcm", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_hcm), "hcm", 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}, {NSC_INT, 0, 0, offsetof(struct mchrstr, m_armor), "armor", EF_BAD},
@ -343,7 +343,7 @@ struct castr land_ca[] = {
struct castr lchr_ca[] = { struct castr lchr_ca[] = {
{NSC_STRING, 0, 0, offsetof(struct lchrstr, l_name), "name", EF_BAD}, {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_lcm), "lcm", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_hcm), "hcm", 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}, {NSC_INT, 0, 0, offsetof(struct lchrstr, l_gun), "gun", EF_BAD},