Author: sveinung
Date: Tue Mar 8 15:27:57 2016
New Revision: 32206
URL: http://svn.gna.org/viewcvs/freeciv?rev=32206&view=rev
Log:
Forbid airlift to city where unit can't exist.
See bug #24504
Modified:
branches/S2_6/common/unit.c
Modified: branches/S2_6/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/unit.c?rev=32206&r1=32205&r2=32206&view=diff
==============================================================================
--- branches/S2_6/common/unit.c (original)
+++ branches/S2_6/common/unit.c Tue Mar 8 15:27:57 2016
@@ -92,6 +92,15 @@
if (psrc_city == pdest_city) {
/* Airlifting to our current position doesn't make sense. */
+ return AR_BAD_DST_CITY;
+ }
+
+ if (pdest_city
+ && (NULL == restriction
+ || (tile_get_known(city_tile(pdest_city), restriction)
+ == TILE_KNOWN_SEEN))
+ && !can_unit_exist_at_tile(punit, city_tile(pdest_city))) {
+ /* Can't exist at the destination tile. */
return AR_BAD_DST_CITY;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
