Author: sveinung
Date: Wed Aug 10 16:45:17 2016
New Revision: 33543

URL: http://svn.gna.org/viewcvs/freeciv?rev=33543&view=rev
Log:
SDL client: ask for target for "Do...".

Change "Do..." to always ask the player for a target tile. This is done
to give the SDL client the ability to specify a target tile for the action
selection dialog without having to add a new button to the limited space it
has.

See patch #7575

Modified:
    trunk/client/gui-sdl2/menu.c

Modified: trunk/client/gui-sdl2/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=33543&r1=33542&r2=33543&view=diff
==============================================================================
--- trunk/client/gui-sdl2/menu.c        (original)
+++ trunk/client/gui-sdl2/menu.c        Wed Aug 10 16:45:17 2016
@@ -240,7 +240,7 @@
       popup_unit_disband_dlg(pUnit, FALSE);
       break;
     case ID_UNIT_ORDER_DIPLOMAT_DLG:
-      key_unit_action_select();
+      key_unit_action_select_tgt();
       break;
     case ID_UNIT_ORDER_NUKE:
       key_unit_nuke();
@@ -439,7 +439,7 @@
   add_to_gui_list(ID_UNIT_ORDER_NUKE, pBuf);
   /* --------- */
 
-  /* Act against own tile. */
+  /* Act against the specified tile. */
   /* TRANS: Button to bring up the action selection dialog. */
   fc_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Do..."), "D");
   pBuf = create_themeicon(current_theme->OSpy_Icon, Main.gui,
@@ -1400,7 +1400,7 @@
         }
       }
 
-     if (can_unit_act_against_own_tile(pUnit)) {
+     if (unit_can_do_action(pUnit, ACTION_ANY)) {
        local_show(ID_UNIT_ORDER_DIPLOMAT_DLG);
       } else {
        local_hide(ID_UNIT_ORDER_DIPLOMAT_DLG);


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

Reply via email to