diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index a34cf0cda..e02ed20ba 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -135,7 +135,7 @@ restart_race(unit *u, const race * rc) u->orders = NULL; while (*ordp) { order * ord = *ordp; - if (get_keyword(ord) == K_RESTART) { + if (get_keyword(ord) != K_RESTART) { *ordp = ord->next; ord->next = NULL; if (u->thisorder == ord) set_order(&u->thisorder, NULL); diff --git a/src/common/kernel/race.c b/src/common/kernel/race.c index 3178ccc95..1ea716ce5 100644 --- a/src/common/kernel/race.c +++ b/src/common/kernel/race.c @@ -186,9 +186,8 @@ give_starting_equipment(struct region *r, struct unit *u) i_add(&u->items, i_new(itm->type, itm->number)); itm=itm->next; } - set_money(u, turn * 10); - switch(old_race(u->race)) { + switch(old_race(u->race)) { case RC_DWARF: set_level(u, SK_SWORD, 1); set_item(u, I_AXE, 1); diff --git a/src/scripts/eressea.lua b/src/scripts/eressea.lua index 49b2aae44..74c6a18b0 100644 --- a/src/scripts/eressea.lua +++ b/src/scripts/eressea.lua @@ -67,18 +67,17 @@ function process(orders) end run_scripts() - plan_monsters() - process_orders() - - change_locales() - -- initialize starting equipment for new players - -- probably not necessary, since mapper sets new players, not server add_equipment("conquesttoken", 1); add_equipment("log", 30); add_equipment("stone", 30); add_equipment("money", 4200); + plan_monsters() + process_orders() + + change_locales() + -- use newfactions file to place out new players autoseed(basepath .. "/newfactions")