From fb5a4b85323f024c38e925582f351d0a5f2b5e02 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 14 May 2004 19:40:49 +0000 Subject: [PATCH] (prod): Match materials_cost() more closely. No functional changes. --- src/lib/commands/prod.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/commands/prod.c b/src/lib/commands/prod.c index 7cfd86c6..25a764cc 100644 --- a/src/lib/commands/prod.c +++ b/src/lib/commands/prod.c @@ -239,22 +239,20 @@ prod(void) } else { level_p_e = 1.0; } + /* + * raw material limit + */ used = 999; - comp = pp->p_vtype; - endcomp = pp->p_vtype + pp->p_nv; amount = pp->p_vamt; - while (comp < endcomp) { + endcomp = pp->p_vtype + pp->p_nv; + for (comp = pp->p_vtype; comp < endcomp; comp++, amount++) { if (*amount == 0) - unit_work++; - else { - used = min(used, sect.sct_item[(int)*comp] / *amount); - unit_work += *amount; - } - ++comp; - ++amount; + continue; + used = min(used, sect.sct_item[(int)*comp] / *amount); + unit_work += *amount; } if (unit_work == 0) - continue; + unit_work = 1; /* * is production limited by resources or * workforce?