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

Merge branch 'master' of gitorious.org:eressea/server

This commit is contained in:
Enno Rehling 2010-10-16 21:12:11 -07:00
parent 49a9992896 357de0f249
commit b25d96a015
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kernel/move.c
View File

@ -1830,7 +1830,9 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
* transferiert wurden, kann der aktuelle Befehl gelöscht werden. */
cycle_route(ord, u, step);
set_order(&u->thisorder, NULL);
set_coast(sh, last_point, current_point);
if (!move_on_land) {
set_coast(sh, last_point, current_point);
}
if( is_cursed(sh->attribs, C_SHIP_FLYING, 0) ) {
ADDMSG(&f->msgs, msg_message("shipfly", "ship from to", sh, starting_point, current_point));