Author: sveinung
Date: Sun Jan 11 02:09:07 2015
New Revision: 27618
URL: http://svn.gna.org/viewcvs/freeciv?rev=27618&view=rev
Log:
SDL 1 client: offer to fall through to attack when possible.
The SDL 1 client must have been overlooked when bug #23077 was fixed.
See bug #23157
Modified:
branches/S2_6/client/gui-sdl/action_dialog.c
Modified: branches/S2_6/client/gui-sdl/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/action_dialog.c?rev=27618&r1=27617&r2=27618&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/action_dialog.c (original)
+++ branches/S2_6/client/gui-sdl/action_dialog.c Sun Jan 11 02:09:07 2015
@@ -906,8 +906,10 @@
} action_iterate_end;
/* ---------- */
- if (unit_can_move_to_tile(actor_unit, target_tile, FALSE)) {
-
+ if (unit_can_move_to_tile(actor_unit, target_tile, FALSE)
+ || (is_military_unit(actor_unit) || is_attack_unit(actor_unit))
+ || (can_unit_bombard(actor_unit) && !is_ocean_tile(target_tile))
+ || (!target_city && unit_has_type_flag(actor_unit, UTYF_CAPTURER))) {
create_active_iconlabel(pBuf, pWindow->dst, pStr,
_("Keep moving"),
diplomat_keep_moving_callback);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
