]> git.pond.sub.org Git - empserver/commit
projects / empserver / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 32a6504) | patch
Revert "retreat: Don't report a destroyed ship/land unit couldn't retreat"
authorMarkus Armbruster <armbru@pond.sub.org>
Wed, 7 Jan 2015 13:12:40 +0000 (14:12 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Mon, 2 Mar 2015 07:20:48 +0000 (08:20 +0100)
commitcc8b92d55572ec8c113d42d50ca3903a74a918b5
tree27589f068d103d3a6fb3759c378384bd828b29a6tree | snapshot
parent32a6504a25a12bac5375072adc4a604f4dbcf0adcommit | diff
Revert "retreat: Don't report a destroyed ship/land unit couldn't retreat"

This reverts commit df8a1ffc1bf77567e4972810d5c729a73fcb42e6.

Because it breaks group retreat.  Trivial conflicts due to the removal
of option SAIL.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
Conflicts:
src/lib/subs/retreat.c
tests/retreat/journal.log
src/lib/subs/retreat.c diff | blob | history
tests/retreat/01-retreat-1 diff | blob | history
tests/retreat/final.xdump diff | blob | history
tests/retreat/journal.log diff | blob | history
Markus's Wolfpack Empire tree