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

(pchrstr, MAXPRCON): Simplify variable-style storage of constituents.

Browse source 
Store only up to MAXPRCON constituents, not MAXCHRNV; code doesn't
fully support more than three anyway.  Remove member p_nv, use item
type I_NONE for unused slots.  Rename members p_vtype, p_vamt to
p_ctype, p_camt to avoid confusion with variable-style storage.
(pchr): Initializers adapted.
(nullify_objects, materials_cost, materials_charge, prod,
show_sect_capab, grind): Adapt, simplify where possible, protect
against bad item types in pchr[].
(MAXCHRNV): Unused, remove.
This commit is contained in:
Markus Armbruster 2004-08-17 15:19:46 +00:00
parent 15d4f89951
commit 4d154753b8
8 changed files with 103 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/lib/update/produce.c
View file

@ -176,53 +176,42 @@ produce(struct natstr *np, struct sctstr *sp, short *vec, int work,
}
static int
materials_cost(struct pchrstr *product, short *vec, int *costp)
materials_cost(struct pchrstr *pp, short *vec, int *costp)
{
register u_char *vp;
register u_short *ap;
register int count;
register int cost;
register int n;
register u_char *endp;
int count;
int cost;
int i, n;
count = 9999;
cost = 0;
ap = product->p_vamt;
endp = product->p_vtype + product->p_nv;
for (vp = product->p_vtype; vp < endp; vp++, ap++) {
if (!*ap)
for (i = 0; i < MAXPRCON; ++i) {
if (!pp->p_camt[i])
continue;
n = vec[*vp & ~VT_ITEM] / *ap;
if (CANT_HAPPEN(pp->p_ctype[i] <= I_NONE || I_MAX < pp->p_ctype[i]))
continue;
n = vec[pp->p_ctype[i]] / pp->p_camt[i];
if (n < count)
count = n;
cost += *ap;
cost += pp->p_camt[i];
}
*costp = cost;
return count;
}
static void
materials_charge(struct pchrstr *product, short *vec, int count)
materials_charge(struct pchrstr *pp, short *vec, int count)
{
register u_char *vp;
register u_short *ap;
register u_char *endp;
register int item;
register int n;
int i, item, n;
ap = product->p_vamt;
endp = product->p_vtype + product->p_nv;
for (vp = product->p_vtype; vp < endp; vp++, ap++) {
item = *vp & ~VT_ITEM;
if (item < 0 || item > I_MAX) {
logerror("materials_charge: bad item %d", item);
for (i = 0; i < MAXPRCON; ++i) {
item = pp->p_ctype[i];
if (!pp->p_camt[i])
continue;
}
if ((n = vec[item] - *ap * count) < 0) {
logerror("materials_charge: %d > %d item #%d",
n, vec[item], item);
if (CANT_HAPPEN(item <= I_NONE || I_MAX < item))
continue;
n = vec[item] - pp->p_camt[i] * count;
if (CANT_HAPPEN(n < 0))
n = 0;
}
vec[item] = n;
}
}