forked from github/server
NEUSTART hat mehrere Fehler Issue: 539
This commit is contained in:
parent
ea321bbc59
commit
1ebff5601a
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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")
|
||||
|
||||
|
|
Loading…
Reference in New Issue