diff --git a/src/common/kernel/movement.c b/src/common/kernel/movement.c index 427ccd960..7b4a14636 100644 --- a/src/common/kernel/movement.c +++ b/src/common/kernel/movement.c @@ -932,6 +932,14 @@ transport(unit * ut, unit * u) return false; } +static boolean +can_move(const unit * u) +{ + if (u->race->flags & RCF_CANNOTMOVE) return false; + if (get_movement(&u->attribs, MV_CANNOTMOVE)) return false; + return true; +} + static void init_transportation(void) { @@ -2090,14 +2098,6 @@ hunted_dir(attrib *at, int id) return NODIRECTION; } -static boolean -can_move(const unit * u) -{ - if (u->race->flags & RCF_CANNOTMOVE) return false; - if (get_movement(&u->attribs, MV_CANNOTMOVE)) return false; - return true; -} - static int hunt(unit *u) { diff --git a/src/common/modules/autoseed.c b/src/common/modules/autoseed.c index 8ace91d9e..61ed97b41 100644 --- a/src/common/modules/autoseed.c +++ b/src/common/modules/autoseed.c @@ -55,7 +55,7 @@ read_newfactions(const char * filename) for (f=factions;f;f=f->next) { if (strcmp(f->email, email)==0 && f->subscription) break; } - if (f) continue; /* skip the ones we've already got */ + if (f && f->units) continue; /* skip the ones we've already got */ for (nf=newfactions;nf;nf=nf->next) { if (strcmp(nf->email, email)==0) break; } @@ -320,7 +320,7 @@ autoseed(newfaction ** players, int nsize) for (rptr=rlist;rptr;rptr=rptr->next) { region * r = rlist->data; unit * u; - for (u=r->units;u;u->next) { + for (u=r->units;u;u=u->next) { f = u->faction; if (!fval(f, FL_MARK)) { ++psize; diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua index 4965ef8dd..d0d6449a5 100644 --- a/src/scripts/eressea.lua +++ b/src/scripts/eressea.lua @@ -58,8 +58,7 @@ function process(orders) plan_monsters() process_orders() - -- localechange = { de = { "bLub" } } - localechange = { } + localechange = { en = { "y7hq" } } for loc, flist in localechange do for index, name in flist do f = get_faction(atoi36(name)) @@ -72,6 +71,8 @@ function process(orders) autoseed(basepath .. "/newfactions") + autoseed(basepath .. "/newfactions") + write_passwords() write_reports()