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

(scra): Obey ITEM_MAX.

Browse source
This commit is contained in:
Markus Armbruster 2004-09-17 12:55:33 +00:00
parent 8b8fba25ed
commit 57bea595cd
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/lib/commands/scra.c
View file

@ -186,7 +186,6 @@ scra(void)
} }
} }
pr("%s", prship(&item.ship)); pr("%s", prship(&item.ship));
/* FIXME obey ITEM_MAX */
for (i = I_NONE + 1; i <= I_MAX; i++) { for (i = I_NONE + 1; i <= I_MAX; i++) {
sect.sct_item[i] += item.ship.shp_item[i]; sect.sct_item[i] += item.ship.shp_item[i];
} }
@ -253,7 +252,6 @@ scra(void)
eff = ((float)item.land.lnd_effic / 100.0); eff = ((float)item.land.lnd_effic / 100.0);
lp = &lchr[(int)item.land.lnd_type]; lp = &lchr[(int)item.land.lnd_type];
pr("%s", prland(&item.land)); pr("%s", prland(&item.land));
/* FIXME obey ITEM_MAX */
for (i = I_NONE + 1; i <= I_MAX; i++) { for (i = I_NONE + 1; i <= I_MAX; i++) {
sect.sct_item[i] += item.land.lnd_item[i]; sect.sct_item[i] += item.land.lnd_item[i];
} }
@ -322,7 +320,6 @@ scra(void)
eff = ((float)item.land.lnd_effic / 100.0); eff = ((float)item.land.lnd_effic / 100.0);
pp = &plchr[(int)item.plane.pln_type]; pp = &plchr[(int)item.plane.pln_type];
pr("%s", prplane(&item.plane)); pr("%s", prplane(&item.plane));
/* FIXME obey ITEM_MAX */
sect.sct_item[I_LCM] += pp->pl_lcm * 2 / 3 * eff; sect.sct_item[I_LCM] += pp->pl_lcm * 2 / 3 * eff;
sect.sct_item[I_HCM] += pp->pl_hcm * 2 / 3 * eff; sect.sct_item[I_HCM] += pp->pl_hcm * 2 / 3 * eff;
sect.sct_item[I_MILIT] += pp->pl_crew; sect.sct_item[I_MILIT] += pp->pl_crew;
@ -333,6 +330,10 @@ scra(void)
} }
pr(" scrapped in %s\n", pr(" scrapped in %s\n",
xyas(sect.sct_x, sect.sct_y, player->cnum)); xyas(sect.sct_x, sect.sct_y, player->cnum));
for (i = I_NONE + 1; i <= I_MAX; i++) {
if (sect.sct_item[i] > ITEM_MAX)
sect.sct_item[i] = ITEM_MAX;
}
putsect(&sect); putsect(&sect);
} }
return RET_OK; return RET_OK;