config: Generalize infrastructure build materials storage

Infrastructure requires lcms and hcms to build.  The build materials
are exposed as infrastructure columns lcms, hcms (struct sctintrins
members in_lcms, in_hcms).  They are per point of efficiency.  In
contrast, sector and unit build materials are defined for 100%.

We want to define build materials for 100% now, for flexibility and
consistency, and we want to optionally support more build materials in
the future.  Replace members in_lcms and in_hcms by array in_mat[],
and provide selectors l_build and h_build.

Additionally provide selectors for all other item types, with value
zero, to help clients prepare for future additional materials.  Use
CA_DUMP_ONLY to keep them out of configuration tables until they
actually work.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-08-17 21:01:32 +02:00
parent c8b51ec1a8
commit 5d3abc9917
8 changed files with 52 additions and 50 deletions

View file

@ -429,7 +429,7 @@ show_sect_build(int foo)
"infrastructure type lcm hcm mobil $\n");
pr("%-23.23s %4d %4d %5d %5d\n",
intrchr[i].in_name,
intrchr[i].in_lcms * 100, intrchr[i].in_hcms * 100,
intrchr[i].in_mat[I_LCM], intrchr[i].in_mat[I_HCM],
intrchr[i].in_bmobil, intrchr[i].in_cost);
first = 0;
}