Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Bug-1516'

This commit is contained in:
CTD 2014-08-13 23:33:27 +02:00
parent 233f707780 246a92f666
commit df1a4b5a47
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/give.c
View File

@ -120,7 +120,7 @@ give_item(int want, const item_type * itype, unit * src, unit * dest,
int n, r;
assert(itype != NULL);
n = get_pooled(src, item2resource(itype), GET_DEFAULT, want);
n = get_pooled(src, item2resource(itype), GET_SLACK | GET_POOLED_SLACK, want);
n = _min(want, n);
r = n;
if (dest && src->faction != dest->faction
@ -144,7 +144,7 @@ give_item(int want, const item_type * itype, unit * src, unit * dest,
int use = use_pooled(src, item2resource(itype), GET_SLACK, n);
if (use < n)
use +=
use_pooled(src, item2resource(itype), GET_RESERVE | GET_POOLED_SLACK,
use_pooled(src, item2resource(itype), GET_POOLED_SLACK,
n - use);
if (dest) {
r = give_quota(src, dest, itype, n);