From 246a92f666e5944a25f77585a6ae78bd2c2e6142 Mon Sep 17 00:00:00 2001 From: CTD Date: Tue, 29 Jul 2014 14:33:57 +0200 Subject: [PATCH] Bug 1516 Trotz Reserviere, Pferde abgegeben. Gib xyz anzahl irgendwas ignoriert nicht mehr das eigene Reserviere. --- src/give.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/give.c b/src/give.c index 3a47957dc..e03241bbb 100644 --- a/src/give.c +++ b/src/give.c @@ -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);