Project

General

Profile

Bug #525 » 0004-Handle-Triremes-correctly-on-city-removal.patch

S2_6 - Marko Lindqvist, 05/03/2024 03:45 PM

View differences:

server/citytools.c
bool moved;
struct unit_type *punittype = unit_type_get(punit);
if (is_native_tile(punittype, pcenter)) {
if (is_native_tile(punittype, pcenter)
&& (!utype_has_flag(punittype, UTYF_TRIREME)
|| is_safe_ocean(pcenter))) {
continue;
}
unit_activity_handling(punit, ACTIVITY_IDLE);
moved = FALSE;
adjc_iterate(pcenter, tile1) {
if (!moved && is_native_tile(punittype, tile1)) {
if (!moved && can_exist_at_tile(punittype, tile1)) {
if (adv_could_unit_move_to_tile(punit, tile1) == 1) {
/* Move */
moved = unit_move_handling(punit, tile1, FALSE, TRUE, NULL);
(3-3/3)