Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

http://eressea.upb.de/mantis/view.php?id=539 

NEUSTART hat mehrere Fehler
Issue: 539
This commit is contained in:
Enno Rehling 2005-06-04 15:34:04 +00:00
parent ea321bbc59
commit 1ebff5601a
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/gamecode/laws.c
View File

@ -135,7 +135,7 @@ restart_race(unit *u, const race * rc)
u->orders = NULL; u->orders = NULL;
while (*ordp) { while (*ordp) {
order * ord = *ordp; order * ord = *ordp;
if (get_keyword(ord) == K_RESTART) { if (get_keyword(ord) != K_RESTART) {
*ordp = ord->next; *ordp = ord->next;
ord->next = NULL; ord->next = NULL;
if (u->thisorder == ord) set_order(&u->thisorder, NULL); if (u->thisorder == ord) set_order(&u->thisorder, NULL);

3
src/common/kernel/race.c
View File

@ -186,9 +186,8 @@ give_starting_equipment(struct region *r, struct unit *u)
i_add(&u->items, i_new(itm->type, itm->number)); i_add(&u->items, i_new(itm->type, itm->number));
itm=itm->next; itm=itm->next;
} }
set_money(u, turn * 10);
switch(old_race(u->race)) { switch(old_race(u->race)) {
case RC_DWARF: case RC_DWARF:
set_level(u, SK_SWORD, 1); set_level(u, SK_SWORD, 1);
set_item(u, I_AXE, 1); set_item(u, I_AXE, 1);

11
src/scripts/eressea.lua
View File

@ -67,18 +67,17 @@ function process(orders)
end end
run_scripts() run_scripts()
plan_monsters()
process_orders()
change_locales()
-- initialize starting equipment for new players -- initialize starting equipment for new players
-- probably not necessary, since mapper sets new players, not server
add_equipment("conquesttoken", 1); add_equipment("conquesttoken", 1);
add_equipment("log", 30); add_equipment("log", 30);
add_equipment("stone", 30); add_equipment("stone", 30);
add_equipment("money", 4200); add_equipment("money", 4200);
plan_monsters()
process_orders()
change_locales()
-- use newfactions file to place out new players -- use newfactions file to place out new players
autoseed(basepath .. "/newfactions") autoseed(basepath .. "/newfactions")