diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c index 6301dab57..b10fef865 100644 --- a/src/common/kernel/pool.c +++ b/src/common/kernel/pool.c @@ -192,7 +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 ((urace(v)->ec_flags & GIVEITEM) == 0) continue; if (v->faction == f) { if ((mode & GET_POOLED_FORCE)==0) { @@ -245,7 +245,7 @@ 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 ((urace(v)->ec_flags & GIVEITEM) == 0) continue; if (v->faction == f) { if ((mode & GET_POOLED_FORCE)==0) { diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua index 4fb5ea4f4..78b774b87 100644 --- a/src/scripts/eressea.lua +++ b/src/scripts/eressea.lua @@ -73,8 +73,8 @@ function process(orders) plan_monsters() local nmrs = get_nmrs(1) - if nmrs >= 60 then - print("Shit. More than 60 factions with 1 NMR (" .. nmrs .. ")") + if nmrs >= 70 then + print("Shit. More than 70 factions with 1 NMR (" .. nmrs .. ")") return -1 end print (nmrs .. " Factions with 1 NMR")