<URL: http://bugs.freeciv.org/Ticket/Display.html?id=34530 >
Units might get disbanded even after they were saved from disbanded
city. Fix attached.
#34515 takes care of this for trunk.
- ML
diff -Nurd -X.diff_ignore freeciv/server/citytools.c freeciv/server/citytools.c
--- freeciv/server/citytools.c 2007-01-20 19:04:29.000000000 +0200
+++ freeciv/server/citytools.c 2007-01-25 15:43:01.000000000 +0200
@@ -1084,7 +1084,7 @@
handle_unit_activity_request(punit, ACTIVITY_IDLE);
moved = FALSE;
adjc_iterate(ptile, tile1) {
- if (is_ocean(tile_get_terrain(tile1))) {
+ if (!moved && is_ocean(tile_get_terrain(tile1))) {
if (could_unit_move_to_tile(punit, tile1) == 1) {
moved = handle_unit_move_request(punit, tile1, FALSE, TRUE);
if (moved) {
@@ -1092,6 +1092,7 @@
_("Moved %s out of disbanded city %s "
"to avoid being landlocked."),
unit_type(punit)->name, pcity->name);
+ break;
}
}
}
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
