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

cleanup

This commit is contained in:
Enno Rehling 2006-10-07 21:25:11 +00:00
parent 19fd2d7265
commit 29f7128dee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +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 ((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) {
@ -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) { 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 ((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) {

4
src/scripts/eressea.lua
View File

@ -73,8 +73,8 @@ function process(orders)
plan_monsters() plan_monsters()
local nmrs = get_nmrs(1) local nmrs = get_nmrs(1)
if nmrs >= 60 then if nmrs >= 70 then
print("Shit. More than 60 factions with 1 NMR (" .. nmrs .. ")") print("Shit. More than 70 factions with 1 NMR (" .. nmrs .. ")")
return -1 return -1
end end
print (nmrs .. " Factions with 1 NMR") print (nmrs .. " Factions with 1 NMR")