forked from github/server
check that there are any regions that we can seed new factions into don't run into endless loop
This commit is contained in:
parent
c31f543718
commit
f2c02232cd
|
@ -47,8 +47,11 @@ local function read_players()
|
|||
end
|
||||
|
||||
local function seed(r, email, race, lang)
|
||||
assert(r)
|
||||
local f = faction.create(email, race, lang)
|
||||
assert(f)
|
||||
local u = unit.create(f, r)
|
||||
assert(u)
|
||||
equip_unit(u, "new_faction")
|
||||
equip_unit(u, "first_unit")
|
||||
equip_unit(u, "first_" .. race, 7) -- disable old callbacks
|
||||
|
@ -69,15 +72,21 @@ end
|
|||
|
||||
function autoseed.init()
|
||||
-- local newbs = {}
|
||||
local num_seeded = per_region
|
||||
local num_seeded = 0
|
||||
local start = nil
|
||||
|
||||
eressea.log.info('autoseed new players')
|
||||
players = read_players()
|
||||
if players then
|
||||
print('autoseed ' .. #players .. ' new players')
|
||||
end
|
||||
if players and #players >= per_region then
|
||||
local sel
|
||||
eressea.log.info(#players .. ' new players')
|
||||
sel = select_regions(regions(), peasants, trees)
|
||||
if #sel == 0 then
|
||||
eressea.log.error("autoseed could not select regions for new factions")
|
||||
else
|
||||
for _, p in ipairs(players) do
|
||||
if num_seeded == per_region then
|
||||
while not start or start.units() do
|
||||
|
@ -98,5 +107,6 @@ function autoseed.init()
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return autoseed
|
||||
|
|
|
@ -889,20 +889,16 @@ static int tolua_unit_create(lua_State * L)
|
|||
{
|
||||
faction *f = (faction *)tolua_tousertype(L, 1, 0);
|
||||
region *r = (region *)tolua_tousertype(L, 2, 0);
|
||||
int num = (int)tolua_tonumber(L, 3, 1);
|
||||
if (f && r) {
|
||||
const race *rc = f->race;
|
||||
const char *rcname = tolua_tostring(L, 4, NULL);
|
||||
if (rcname)
|
||||
rc = rc_find(rcname);
|
||||
if (rc) {
|
||||
int num = (int)tolua_tonumber(L, 3, 1);
|
||||
const race *rc;
|
||||
assert(f && r);
|
||||
rc = rcname ? rc_find(rcname) : f->race;
|
||||
assert(rc);
|
||||
unit *u = create_unit(r, f, num, rc, 0, NULL, NULL);
|
||||
tolua_pushusertype(L, u, TOLUA_CAST "unit");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tolua_unit_tostring(lua_State * L)
|
||||
{
|
||||
|
|
|
@ -448,7 +448,7 @@ static int tolua_equipunit(lua_State * L)
|
|||
unit *u = (unit *)tolua_tousertype(L, 1, 0);
|
||||
const char *eqname = tolua_tostring(L, 2, 0);
|
||||
int mask = (int)tolua_tonumber(L, 3, EQUIP_ALL);
|
||||
assert(mask > 0);
|
||||
assert(u && mask > 0);
|
||||
equip_unit_mask(u, get_equipment(eqname), mask);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -174,7 +174,7 @@ static unit *unitorders(FILE * F, int enc, struct faction *f)
|
|||
if (s[0] != '@') {
|
||||
char token[128];
|
||||
const char *stok = s;
|
||||
stok = parse_token(&stok, token, sizeof(token));
|
||||
stok = parse_token(&stok, token, 64); // FIXME: use sizeof, but parse_token overwrites the buffer
|
||||
|
||||
if (stok) {
|
||||
bool quit = false;
|
||||
|
|
|
@ -176,6 +176,7 @@ static void log_stdio(void *data, int level, const char *module, const char *for
|
|||
if (format[len - 1] != '\n') {
|
||||
fputc('\n', out);
|
||||
}
|
||||
fflush(out);
|
||||
}
|
||||
|
||||
log_t *log_to_file(int flags, FILE *out) {
|
||||
|
|
Loading…
Reference in New Issue