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

(lnd_maxno): Variable's value is well-known constant N_MAXLAND + 1.

Browse source 
Useless, remove.  Users changed to check lchr's sentinel, because
that's clearer than comparing the index to N_MAXLAND or sizeof(lchr) /
sizeof(*lchr).

(lchr): Change sentinel's l_name to NULL.
This commit is contained in:
Markus Armbruster 2005-11-06 20:59:38 +00:00
parent 190cbaadf2
commit 04c247f2da
4 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/land.h
View file

@ -182,7 +182,6 @@ struct lchrstr {
(struct lndstr *) ef_ptr(EF_LAND, n) (struct lndstr *) ef_ptr(EF_LAND, n)
extern struct lchrstr lchr[N_MAXLAND + 1]; extern struct lchrstr lchr[N_MAXLAND + 1];
extern int lnd_maxno;
struct llist { struct llist {
struct emp_qelem queue; /* list of units */ struct emp_qelem queue; /* list of units */

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

@ -207,11 +207,9 @@ struct lchrstr lchr[] = {
*/ */
{{0}, {{0},
"", NULL,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0,
} }
}; };
int lnd_maxno = (sizeof(lchr) / sizeof(struct lchrstr)) - 1;

4
src/lib/subs/show.c
View file

@ -117,11 +117,9 @@ make_new_list(int tlev, int type)
lookup_list_cnt++; lookup_list_cnt++;
} }
} else if (type == EF_LAND) { } else if (type == EF_LAND) {
for (lp = lchr, count = 0; count < lnd_maxno; count++, lp++) { for (lp = lchr; lp->l_name; lp++) {
if (lp->l_tech > tlev) if (lp->l_tech > tlev)
continue; continue;
if (lp->l_name == 0 || lp->l_name[0] == '\0')
continue;
lookup_list[lookup_list_cnt].l_u.lp = lp; lookup_list[lookup_list_cnt].l_u.lp = lp;
lookup_list[lookup_list_cnt].tech = lp->l_tech; lookup_list[lookup_list_cnt].tech = lp->l_tech;
lookup_list_cnt++; lookup_list_cnt++;

2
src/server/main.c
View file

@ -503,7 +503,7 @@ nullify_objects(void)
if (opt_NO_OIL) if (opt_NO_OIL)
plchr[i].pl_fuel = 0; plchr[i].pl_fuel = 0;
} }
for (i = 0; i < lnd_maxno; i++) { for (i = 0; i < lchr[i].l_name; i++) {
if (opt_NO_HCMS) if (opt_NO_HCMS)
lchr[i].l_hcm = 0; lchr[i].l_hcm = 0;
if (opt_NO_LCMS) if (opt_NO_LCMS)