Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2015-11-04 09:05:04 +01:00
commit 1993e5e384
1 changed files with 16 additions and 16 deletions

View File

@ -78,7 +78,6 @@ function autoseed.init()
local sel local sel
eressea.log.info(#players .. ' new players') eressea.log.info(#players .. ' new players')
sel = select_regions(regions(), peasants, trees) sel = select_regions(regions(), peasants, trees)
end
for _, p in ipairs(players) do for _, p in ipairs(players) do
if num_seeded == per_region then if num_seeded == per_region then
while not start or start.units() do while not start or start.units() do
@ -97,6 +96,7 @@ function autoseed.init()
-- table.insert(newbs, f) -- table.insert(newbs, f)
end end
end end
end
end end
return autoseed return autoseed