From e15b7e2b9a2f517e9abb135fa0ee5ba0b18d4627 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 23 Jul 2005 16:53:06 +0000 Subject: [PATCH] (trade_desc, get_materials): Use i_type variable instead of int for iterating over item types. --- src/lib/subs/trdsub.c | 13 +++++++------ src/lib/update/material.c | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/subs/trdsub.c b/src/lib/subs/trdsub.c index eaf98a0e..c7143c4f 100644 --- a/src/lib/subs/trdsub.c +++ b/src/lib/subs/trdsub.c @@ -97,6 +97,7 @@ int trade_desc(struct trdstr *tp, union trdgenstr *tgp) { int i; + i_type it; struct sctstr sect; struct nukstr *np; struct shpstr *sp; @@ -132,9 +133,9 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp) pr("(%3d) tech %d %d%% %s [", tp->trd_owner, sp->shp_tech, sp->shp_effic, prship(sp)); - for (i = I_NONE + 1; i <= I_MAX; ++i) { - if (sp->shp_item[i]) - pr("%c:%d ", ichr[i].i_mnem, sp->shp_item[i]); + for (it = I_NONE + 1; it <= I_MAX; ++it) { + if (sp->shp_item[it]) + pr("%c:%d ", ichr[it].i_mnem, sp->shp_item[it]); } pr("] #%d", tp->trd_unitid); if (opt_SHOWPLANE) { @@ -190,9 +191,9 @@ trade_desc(struct trdstr *tp, union trdgenstr *tgp) pr("(%3d) tech %d %d%% %s [", tp->trd_owner, lp->lnd_tech, lp->lnd_effic, lchr[(int)lp->lnd_type].l_name); - for (i = I_NONE + 1; i <= I_MAX; ++i) { - if (lp->lnd_item[i]) - pr("%c:%d ", ichr[i].i_mnem, lp->lnd_item[i]); + for (it = I_NONE + 1; it <= I_MAX; ++it) { + if (lp->lnd_item[it]) + pr("%c:%d ", ichr[it].i_mnem, lp->lnd_item[it]); } pr("] #%d", tp->trd_unitid); if (opt_SHOWPLANE) { diff --git a/src/lib/update/material.c b/src/lib/update/material.c index ec98453f..5aedfd3b 100644 --- a/src/lib/update/material.c +++ b/src/lib/update/material.c @@ -47,7 +47,7 @@ void get_materials(struct sctstr *sp, int *bp, int *mvec, int check) /* only check if found=0, remove them=1 */ { - int i; + i_type i; int still_left; for (i = I_NONE + 1; i <= I_MAX; i++) {