From 19fd2d72654b722341a95328af37ccc0401b1414 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 7 Oct 2006 21:10:05 +0000 Subject: [PATCH] http://eressea.upb.de/mantis/view.php?id=995 "RESERVIERE und GIB bei Monstern" Test auf GIVEITEM eingefuehrt. --- src/common/kernel/pool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c index a91be0e66..6301dab57 100644 --- a/src/common/kernel/pool.c +++ b/src/common/kernel/pool.c @@ -192,6 +192,7 @@ get_pooled(const unit * u, const resource_type * rtype, unsigned int mode, int c if (u==v) continue; if (fval(v, UFL_LOCKED)) continue; if (urace(v)->ec_flags & NOGIVE) continue; + if (urace(v)->ec_flags & GIVEITEM == 0) continue; if (v->faction == f) { if ((mode & GET_POOLED_FORCE)==0) { @@ -244,6 +245,8 @@ use_pooled(unit * u, const resource_type * rtype, unsigned int mode, int count) for (v = r->units; use>0 && v!=NULL; v = v->next) if (u!=v) { int mask; if (urace(v)->ec_flags & NOGIVE) continue; + if (urace(v)->ec_flags & GIVEITEM == 0) continue; + if (v->faction == f) { if ((mode & GET_POOLED_FORCE)==0) { if (rtype==r_silver && !(f->options & want_sp)) continue;