Author: sveinung
Date: Sun Jul 19 15:33:48 2015
New Revision: 29227
URL: http://svn.gna.org/viewcvs/freeciv?rev=29227&view=rev
Log:
Xaw client: support bombard as action.
See patch #6132
Modified:
trunk/client/gui-xaw/action_dialog.c
trunk/data/Freeciv.in
Modified: trunk/client/gui-xaw/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/action_dialog.c?rev=29227&r1=29226&r2=29227&view=diff
==============================================================================
--- trunk/client/gui-xaw/action_dialog.c (original)
+++ trunk/client/gui-xaw/action_dialog.c Sun Jul 19 15:33:48 2015
@@ -272,6 +272,19 @@
XtPointer call_data)
{
request_do_action(ACTION_CAPTURE_UNITS, diplomat_id,
+ diplomat_target_id[ATK_UNITS], 0, "");
+
+ destroy_message_dialog(w);
+ diplomat_dialog = NULL;
+}
+
+/****************************************************************
+ Bombard action was chosen
+*****************************************************************/
+static void bombard_callback(Widget w, XtPointer client_data,
+ XtPointer call_data)
+{
+ request_do_action(ACTION_BOMBARD, diplomat_id,
diplomat_target_id[ATK_UNITS], 0, "");
destroy_message_dialog(w);
@@ -981,6 +994,7 @@
found_city_callback, 0, 0,
join_city_callback, 0, 0,
spy_steal_maps_callback, 0, 0,
+ bombard_callback, 0, 0,
diplomat_keep_moving_callback, target_tile, 1,
diplomat_cancel_callback, 0, 0,
NULL);
@@ -1057,9 +1071,13 @@
ACTION_STEAL_MAPS,
act_probs);
+ action_entry(XtNameToWidget(diplomat_dialog, "*button18"),
+ ACTION_BOMBARD,
+ act_probs);
+
if (!(unit_can_move_to_tile(actor_unit, target_tile, FALSE)
|| (is_military_unit(actor_unit) || is_attack_unit(actor_unit)))) {
- XtSetSensitive(XtNameToWidget(diplomat_dialog, "*button18"), FALSE);
+ XtSetSensitive(XtNameToWidget(diplomat_dialog, "*button19"), FALSE);
}
astr_free(&text);
Modified: trunk/data/Freeciv.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/data/Freeciv.in?rev=29227&r1=29226&r2=29227&view=diff
==============================================================================
--- trunk/data/Freeciv.in (original)
+++ trunk/data/Freeciv.in Sun Jul 19 15:33:48 2015
@@ -2330,12 +2330,14 @@
Freeciv*diplomatdialog.*.button17.fromVert: button15
Freeciv*diplomatdialog.*.button17.fromHoriz: button16
-Freeciv*diplomatdialog.*.button18.label: _("Keep moving")
Freeciv*diplomatdialog.*.button18.fromVert: button16
-Freeciv*diplomatdialog.*.button19.label: _("Cancel")
+Freeciv*diplomatdialog.*.button19.label: _("Keep moving")
Freeciv*diplomatdialog.*.button19.fromVert: button17
Freeciv*diplomatdialog.*.button19.fromHoriz: button18
+
+Freeciv*diplomatdialog.*.button20.label: _("Cancel")
+Freeciv*diplomatdialog.*.button20.fromVert: button18
!
! Spy Steal Tech Dialog
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
