[Freeciv-commits] r35619 - /trunk/client/gui-sdl2/action_dialog.c

[sveinung84]

Author: sveinung
Date: Wed May 17 12:45:09 2017
New Revision: 35619

URL: http://svn.gna.org/viewcvs/freeciv?rev=35619&view=rev
Log:
SDL2 client: add action to small dipl dialog.

Use it in unit bribery and in city inciting.

See hrm Feature #660837

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

Modified: trunk/client/gui-sdl2/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=35619&r1=35618&r2=35619&view=diff
==============================================================================
--- trunk/client/gui-sdl2/action_dialog.c       (original)
+++ trunk/client/gui-sdl2/action_dialog.c       Wed May 17 12:45:09 2017
@@ -58,6 +58,7 @@
 struct small_diplomat_dialog {
   int actor_unit_id;
   int target_id;
+  int action_id;
   struct SMALL_DLG *pdialog;
 };
  
@@ -1911,15 +1912,15 @@
   return -1;
 }
 
-/****************************************************************
+/**************************************************************************
   User confirmed incite
-*****************************************************************/
+**************************************************************************/
 static int diplomat_incite_yes_callback(struct widget *pWidget)
 {
   if (Main.event.button.button == SDL_BUTTON_LEFT) {
     if (NULL != game_unit_by_number(pIncite_Dlg->actor_unit_id)
         && NULL != game_city_by_number(pIncite_Dlg->target_id)) {
-      request_do_action(ACTION_SPY_INCITE_CITY, pIncite_Dlg->actor_unit_id,
+      request_do_action(pIncite_Dlg->action_id, pIncite_Dlg->actor_unit_id,
                         pIncite_Dlg->target_id, 0, "");
     }
 
@@ -1988,6 +1989,7 @@
   pIncite_Dlg = fc_calloc(1, sizeof(struct small_diplomat_dialog));
   pIncite_Dlg->actor_unit_id = actor->id;
   pIncite_Dlg->target_id = pCity->id;
+  pIncite_Dlg->action_id = ACTION_SPY_INCITE_CITY;
   pIncite_Dlg->pdialog = fc_calloc(1, sizeof(struct SMALL_DLG));
 
   fc_snprintf(tBuf, ARRAY_SIZE(tBuf), PL_("Treasury contains %d gold.",
@@ -2181,7 +2183,7 @@
   if (Main.event.button.button == SDL_BUTTON_LEFT) {
     if (NULL != game_unit_by_number(pBribe_Dlg->actor_unit_id)
         && NULL != game_unit_by_number(pBribe_Dlg->target_id)) {
-      request_do_action(ACTION_SPY_BRIBE_UNIT, pBribe_Dlg->actor_unit_id,
+      request_do_action(pBribe_Dlg->action_id, pBribe_Dlg->actor_unit_id,
                         pBribe_Dlg->target_id, 0, "");
     }
     popdown_bribe_dialog();
@@ -2247,6 +2249,7 @@
   is_unit_move_blocked = TRUE;
 
   pBribe_Dlg = fc_calloc(1, sizeof(struct small_diplomat_dialog));
+  pBribe_Dlg->action_id = ACTION_SPY_BRIBE_UNIT;
   pBribe_Dlg->actor_unit_id = actor->id;
   pBribe_Dlg->target_id = pUnit->id;
   pBribe_Dlg->pdialog = fc_calloc(1, sizeof(struct SMALL_DLG));


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