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

http://eressea.upb.de/mantis/view.php?id=995 

"RESERVIERE und GIB bei Monstern"

Test auf GIVEITEM eingefuehrt.
This commit is contained in:
Enno Rehling 2006-10-07 21:10:05 +00:00
parent 2b104afe50
commit 19fd2d7265
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/kernel/pool.c
View File

@ -192,6 +192,7 @@ get_pooled(const unit * u, const resource_type * rtype, unsigned int mode, int c
if (u==v) continue; if (u==v) continue;
if (fval(v, UFL_LOCKED)) continue; if (fval(v, UFL_LOCKED)) continue;
if (urace(v)->ec_flags & NOGIVE) continue; if (urace(v)->ec_flags & NOGIVE) continue;
if (urace(v)->ec_flags & GIVEITEM == 0) continue;
if (v->faction == f) { if (v->faction == f) {
if ((mode & GET_POOLED_FORCE)==0) { 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) { for (v = r->units; use>0 && v!=NULL; v = v->next) if (u!=v) {
int mask; int mask;
if (urace(v)->ec_flags & NOGIVE) continue; if (urace(v)->ec_flags & NOGIVE) continue;
if (urace(v)->ec_flags & GIVEITEM == 0) continue;
if (v->faction == f) { if (v->faction == f) {
if ((mode & GET_POOLED_FORCE)==0) { if ((mode & GET_POOLED_FORCE)==0) {
if (rtype==r_silver && !(f->options & want_sp)) continue; if (rtype==r_silver && !(f->options & want_sp)) continue;