Author: sveinung
Date: Sun Jul 19 15:33:42 2015
New Revision: 29226
URL: http://svn.gna.org/viewcvs/freeciv?rev=29226&view=rev
Log:
SDL clients: support bombardment as action.
See patch #6131
Modified:
trunk/client/gui-sdl/action_dialog.c
trunk/client/gui-sdl2/action_dialog.c
Modified: trunk/client/gui-sdl/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/action_dialog.c?rev=29226&r1=29225&r2=29226&view=diff
==============================================================================
--- trunk/client/gui-sdl/action_dialog.c (original)
+++ trunk/client/gui-sdl/action_dialog.c Sun Jul 19 15:33:42 2015
@@ -720,6 +720,25 @@
popdown_diplomat_dialog();
request_do_action(ACTION_CAPTURE_UNITS,
+ actor_id, target_id, 0, "");
+
+ choose_action_queue_next();
+ }
+
+ return -1;
+}
+
+/****************************************************************
+ User clicked "Bombard"
+*****************************************************************/
+static int bombard_callback(struct widget *pWidget)
+{
+ if (Main.event.button.button == SDL_BUTTON_LEFT) {
+ int actor_id = MAX_ID - pWidget->ID;
+ int target_id = tile_index(pWidget->data.tile);
+
+ popdown_diplomat_dialog();
+ request_do_action(ACTION_BOMBARD,
actor_id, target_id, 0, "");
choose_action_queue_next();
@@ -823,6 +842,7 @@
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = capture_units_callback,
+ [ACTION_BOMBARD] = bombard_callback,
/* Unit acting against a tile. */
[ACTION_FOUND_CITY] = found_city_callback,
Modified: trunk/client/gui-sdl2/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=29226&r1=29225&r2=29226&view=diff
==============================================================================
--- trunk/client/gui-sdl2/action_dialog.c (original)
+++ trunk/client/gui-sdl2/action_dialog.c Sun Jul 19 15:33:42 2015
@@ -723,6 +723,25 @@
popdown_diplomat_dialog();
request_do_action(ACTION_CAPTURE_UNITS,
+ actor_id, target_id, 0, "");
+
+ choose_action_queue_next();
+ }
+
+ return -1;
+}
+
+/****************************************************************
+ User clicked "Bombard"
+*****************************************************************/
+static int bombard_callback(struct widget *pWidget)
+{
+ if (Main.event.button.button == SDL_BUTTON_LEFT) {
+ int actor_id = MAX_ID - pWidget->ID;
+ int target_id = tile_index(pWidget->data.tile);
+
+ popdown_diplomat_dialog();
+ request_do_action(ACTION_BOMBARD,
actor_id, target_id, 0, "");
choose_action_queue_next();
@@ -826,6 +845,7 @@
/* Unit acting against all units at a tile. */
[ACTION_CAPTURE_UNITS] = capture_units_callback,
+ [ACTION_BOMBARD] = bombard_callback,
/* Unit acting against a tile. */
[ACTION_FOUND_CITY] = found_city_callback,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
