]> git.pond.sub.org Git - empserver/commit
Revert "commands: Always put ship or land unit before retreating it"
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 17 May 2015 16:11:20 +0000 (18:11 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 17 May 2015 16:11:20 +0000 (18:11 +0200)
commitfff177be2f7b81fa3db9d47ca8489fc7e05b6799
tree1cc39a67afd8d227fdc439109e4c14c82c91e9cb
parent1c9fb831ed98cc2df1681a5741fb3c75b96b9aee
Revert "commands: Always put ship or land unit before retreating it"

This reverts commit f4d8d64bb34dee75cb2485c130e125fdd3980c18.

Breaks retreat after ship got sunk by bombs or missile.

ship_bomb() and launch_missile() pass .shp_own to retreat_ship().
Wrong after putship(), because putship() resets the owner when the
ship got sunk.  retreat_ship() then oopses and fails to retreat the
surviving members of the group.

Other callers save the owner before putting the ship, and pass that.
We could change these two to do the same.  But since we're trying to
get a release out, simply revert the broken commit instead.
src/lib/commands/bomb.c
src/lib/commands/laun.c
src/lib/commands/mfir.c
src/lib/commands/torp.c