Author: jtn Date: Mon Feb 16 09:46:18 2015 New Revision: 28182 URL: http://svn.gna.org/viewcvs/freeciv?rev=28182&view=rev Log: A bombarder unit attacking an empty city now attempts to occupy it, rather than possibly gaining veterancy.
Reported anonymously. See gna bug #20956. Modified: branches/S2_4/server/unithand.c Modified: branches/S2_4/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/unithand.c?rev=28182&r1=28181&r2=28182&view=diff ============================================================================== --- branches/S2_4/server/unithand.c (original) +++ branches/S2_4/server/unithand.c Mon Feb 16 09:46:18 2015 @@ -1497,9 +1497,9 @@ /* Are we a bombarder? */ if (unit_has_type_flag(punit, F_BOMBARDER)) { - /* Only land can be bombarded, if the target is on ocean, fall - * through to attack. */ - if (!is_ocean_tile(pdesttile)) { + /* Only land can be bombarded; if the target is on ocean (or is + * an empty city), fall through to attack/conquer. */ + if (!is_ocean_tile(pdesttile) && unit_list_size(pdesttile->units) > 0) { if (can_unit_bombard(punit)) { unit_bombard(punit, pdesttile); return TRUE; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits