From 12ce582d62bcb2f682bc400b2cddc6f34ce77b05 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 22 Sep 2021 00:03:31 +0300 Subject: [PATCH 11/11] Allow moving Trireme unit to ocean city, or city in 1x1 island Reported by lexxie9952 See osdn #42600 Signed-off-by: Marko Lindqvist --- common/movement.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/movement.c b/common/movement.c index 0abca02dd7..ed3d849bd7 100644 --- a/common/movement.c +++ b/common/movement.c @@ -641,7 +641,8 @@ unit_move_to_tile_test(const struct unit *punit, } /* 11) */ - if (utype_has_flag(punittype, UTYF_TRIREME) && !is_safe_ocean(dst_tile)) { + if (utype_has_flag(punittype, UTYF_TRIREME) + && !pcity && !is_safe_ocean(dst_tile)) { return MR_TRIREME; } -- 2.33.0