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

(opt_GRAB_THINGS, Options, get_materials): Remove option GRAB_THINGS.

Browse source
This commit is contained in:
Markus Armbruster 2004-03-11 08:53:27 +00:00
parent 9ad7afbf17
commit 689f435aff
4 changed files with 2 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/lib/update/material.c
View file

@ -50,9 +50,7 @@ void
get_materials(struct sctstr *sp, int *bp, int *mvec, int check)
/* only check if found=0, remove them=1 */
{
struct sctstr *usp;
int i;
int used_already;
int still_left;
int svec[I_MAX + 1];
@ -61,35 +59,20 @@ get_materials(struct sctstr *sp, int *bp, int *mvec, int check)
if (mvec[i] == 0)
continue;
usp = sp;
if (check) {
still_left = gt_bg_nmbr(bp, sp, i);
if ((still_left - mvec[i]) < 0)
still_left = 0;
else
still_left -= mvec[i];
if (opt_GRAB_THINGS)
mvec[i] =
supply_commod(usp->sct_own, usp->sct_x, usp->sct_y, i,
mvec[i]);
pt_bg_nmbr(bp, sp, i, still_left);
svec[i] = still_left;
if (!player->simulation)
putvec(VT_ITEM, svec, (s_char *)sp, EF_SECTOR);
} else {
if (opt_GRAB_THINGS) {
used_already = svec[i] - gt_bg_nmbr(bp, sp, i);
mvec[i] =
try_supply_commod(usp->sct_own, usp->sct_x, usp->sct_y,
i, (mvec[i] + used_already));
mvec[i] -= used_already;
} else { /* ! GRAB_THINGS */
still_left = gt_bg_nmbr(bp, sp, i);
mvec[i] = MIN(mvec[i], still_left);
}
still_left = gt_bg_nmbr(bp, sp, i);
mvec[i] = MIN(mvec[i], still_left);
}
}
}