Author: sveinung
Date: Wed Jul 22 16:08:55 2015
New Revision: 29238

URL: http://svn.gna.org/viewcvs/freeciv?rev=29238&view=rev
Log:
If a unit is nuclear is irrelevant in unit_bombard()

See bug #23703

Modified:
    branches/S2_6/server/unithand.c

Modified: branches/S2_6/server/unithand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/unithand.c?rev=29238&r1=29237&r2=29238&view=diff
==============================================================================
--- branches/S2_6/server/unithand.c     (original)
+++ branches/S2_6/server/unithand.c     Wed Jul 22 16:08:55 2015
@@ -1790,9 +1790,7 @@
                           "peace or cease-fire at (%d, %d).",
                           TILE_XY(unit_tile(pdefender)));
     fc_assert_ret_val_msg(!pplayers_allied(unit_owner(punit),
-                                           unit_owner(pdefender))
-                          || (unit_has_type_flag(punit, UTYF_NUCLEAR)
-                              && punit == pdefender), TRUE,
+                                           unit_owner(pdefender)), TRUE,
                           "Trying to attack a unit with which you have "
                           "alliance at (%d, %d).",
                           TILE_XY(unit_tile(pdefender)));


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to