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

http://bugs.eressea.de/view.php?id=1653

This commit is contained in:
Enno Rehling 2009-10-25 22:22:27 +00:00
parent dae2a22b35
commit 250e086eb1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/kernel/move.c
View File

@ -1072,8 +1072,11 @@ cycle_route(order * ord, unit *u, int gereist)
} }
} }
strcat(neworder, tail); if (neworder[0]) {
norder = create_order(K_ROUTE, u->faction->locale, "%s", neworder); norder = create_order(K_ROUTE, u->faction->locale, "%s %s", neworder, tail);
} else {
norder = create_order(K_ROUTE, u->faction->locale, "%s", tail);
}
replace_order(&u->orders, ord, norder); replace_order(&u->orders, ord, norder);
free_order(norder); free_order(norder);
} }

1
src/common/kernel/unit.c
View File

@ -977,6 +977,7 @@ transfermen(unit * u, unit * u2, int n)
remove_skill(u2, sk); remove_skill(u2, sk);
sn = NULL; sn = NULL;
} }
assert(u2->number!=0 || (sn->level==sv->level && sn->weeks==sv->weeks));
} }
a = a_find(u->attribs, &at_effect); a = a_find(u->attribs, &at_effect);
while (a && a->type==&at_effect) { while (a && a->type==&at_effect) {