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

27
src/lib/commands/grin.c
View file

@ -68,23 +68,36 @@ grin(void)
if (sect.sct_effic < 60 || sect.sct_own != player->cnum)
continue;
n = sect.sct_item[I_BAR] >= qty ? qty : sect.sct_item[I_BAR];
avail = n * 5.0;
/* work limit */
avail = n * 5;
if (avail > sect.sct_avail) {
n = sect.sct_avail / 5;
avail = sect.sct_avail;
}
for (i = 0; i < pchr[P_BAR].p_nv; i++) {
/* space limit */
for (i = 0; i < MAXPRCON; i++) {
if (!pchr[P_BAR].p_camt[i])
continue;
if (CANT_HAPPEN(pchr[P_BAR].p_ctype[i] <= I_NONE ||
pchr[P_BAR].p_ctype[i] > I_MAX))
continue;
n = min(n,
(double)(ITEM_MAX - sect.sct_item[pchr[P_BAR].p_vtype[i]])
/ (pchr[P_BAR].p_vamt[i] * grind_eff));
(double)(ITEM_MAX - sect.sct_item[pchr[P_BAR].p_ctype[i]])
/ (pchr[P_BAR].p_camt[i] * grind_eff));
}
if (n > 0) {
pr("%d bars ground up in %s\n", n,
xyas(sect.sct_x, sect.sct_y, player->cnum));
sect.sct_item[I_BAR] -= n;
for (i = 0; i < pchr[P_BAR].p_nv; i++) {
sect.sct_item[pchr[P_BAR].p_vtype[i]]
+= n * pchr[P_BAR].p_vamt[i] * grind_eff;
for (i = 0; i < MAXPRCON; i++) {
if (!pchr[P_BAR].p_camt[i])
continue;
if (CANT_HAPPEN(pchr[P_BAR].p_ctype[i] <= I_NONE ||
pchr[P_BAR].p_ctype[i] > I_MAX))
continue;
sect.sct_item[pchr[P_BAR].p_ctype[i]]
+= n * pchr[P_BAR].p_camt[i] * grind_eff;
}
sect.sct_avail -= avail;
putsect(&sect);

53
src/lib/commands/prod.c
View file

@ -77,8 +77,8 @@ prod(void)
int totpop;
int act; /* actual production */
int cost;
int i;
int max; /* production w/infinate materials */
int i, j;
int max; /* production w/infinite materials */
int nsect;
double take;
double mtake;
@ -87,14 +87,10 @@ prod(void)
int used; /* production w/infinite workforce */
int wforce;
int it;
u_short *amount; /* amount for component pointer */
u_char *comp; /* component pointer */
u_char *endcomp;
u_char vtype;
s_char *resource;
int c;
s_char maxc[3][10];
s_char use[3][10];
s_char maxc[MAXPRCON][10];
s_char use[MAXPRCON][10];
int lcms, hcms;
int civs = 0;
int uws = 0;
@ -232,13 +228,14 @@ prod(void)
* raw material limit
*/
used = 9999;
amount = pp->p_vamt;
endcomp = pp->p_vtype + pp->p_nv;
for (comp = pp->p_vtype; comp < endcomp; comp++, amount++) {
if (*amount == 0)
for (j = 0; j < MAXPRCON; ++j) {
it = pp->p_ctype[j];
if (!pp->p_camt[j])
continue;
used = min(used, sect.sct_item[(int)*comp] / *amount);
unit_work += *amount;
if (CANT_HAPPEN(it <= I_NONE || I_MAX < it))
continue;
used = min(used, sect.sct_item[it] / pp->p_camt[j]);
unit_work += pp->p_camt[j];
}
if (unit_work == 0)
unit_work = 1;
@ -275,22 +272,20 @@ prod(void)
}
}
comp = pp->p_vtype;
amount = pp->p_vamt;
i = 0;
while (comp < endcomp) {
it = unitem((int)*comp);
if (it > 0 && it <= I_MAX && ichr[it].i_name != 0)
c = ichr[it].i_name[0];
else
c = ' ';
(void)sprintf(use[i], " %3d%c",
(int)((take * (double)(*amount)) + 0.5), c);
(void)sprintf(maxc[i], " %3d%c",
(int)((mtake * (double)(*amount)) + 0.5), c);
++comp;
++amount;
++i;
for (j = 0; j < MAXPRCON; ++j) {
it = pp->p_ctype[j];
if (it > I_NONE && it <= I_MAX && ichr[it].i_name != 0) {
if (CANT_HAPPEN(i >= 3))
break;
sprintf(use[i], " %3d%c",
(int)((take * (double)pp->p_camt[j]) + 0.5),
ichr[it].i_name[0]);
sprintf(maxc[i], " %3d%c",
(int)((mtake * (double)pp->p_camt[j]) + 0.5),
ichr[it].i_name[0]);
++i;
}
}
while (i < 3) {
strcpy(use[i], " ");