Author: sveinung
Date: Mon Aug  1 02:40:23 2016
New Revision: 33403

URL: http://svn.gna.org/viewcvs/freeciv?rev=33403&view=rev
Log:
act sel dlg: keep moving isn't Diplomat only.

See patch #7521

Modified:
    branches/S2_6/client/gui-gtk-2.0/action_dialog.c
    branches/S2_6/client/gui-gtk-3.0/action_dialog.c
    branches/S2_6/client/gui-qt/dialogs.cpp
    branches/S2_6/client/gui-sdl/action_dialog.c
    branches/S2_6/client/gui-sdl2/action_dialog.c
    branches/S2_6/client/gui-xaw/action_dialog.c

Modified: branches/S2_6/client/gui-gtk-2.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/action_dialog.c?rev=33403&r1=33402&r2=33403&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/action_dialog.c    (original)
+++ branches/S2_6/client/gui-gtk-2.0/action_dialog.c    Mon Aug  1 02:40:23 2016
@@ -929,11 +929,11 @@
 }
 
 /**************************************************************************
-  Callback from diplomat/spy dialog for "keep moving".
+  Callback from action selection dialog for "keep moving".
   (This should only occur when entering a tile that has an allied city or
   an allied unit.)
 **************************************************************************/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
 {
   struct action_data *args = (struct action_data *)data;
 
@@ -1210,7 +1210,7 @@
     action_button_map[BUTTON_MOVE] =
         choice_dialog_get_number_of_buttons(shl);
     choice_dialog_add(shl, _("_Keep moving"),
-                      (GCallback)diplomat_keep_moving_callback,
+                      (GCallback)act_sel_keep_moving_callback,
                       data, FALSE, NULL);
   }
 

Modified: branches/S2_6/client/gui-gtk-3.0/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/action_dialog.c?rev=33403&r1=33402&r2=33403&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/action_dialog.c    (original)
+++ branches/S2_6/client/gui-gtk-3.0/action_dialog.c    Mon Aug  1 02:40:23 2016
@@ -1021,11 +1021,11 @@
 }
 
 /**************************************************************************
-  Callback from diplomat/spy dialog for "keep moving".
+  Callback from action selection dialog for "keep moving".
   (This should only occur when entering a tile that has an allied city or
   an allied unit.)
 **************************************************************************/
-static void diplomat_keep_moving_callback(GtkWidget *w, gpointer data)
+static void act_sel_keep_moving_callback(GtkWidget *w, gpointer data)
 {
   struct action_data *args = (struct action_data *)data;
 
@@ -1302,7 +1302,7 @@
     action_button_map[BUTTON_MOVE] =
         choice_dialog_get_number_of_buttons(shl);
     choice_dialog_add(shl, _("_Keep moving"),
-                      (GCallback)diplomat_keep_moving_callback,
+                      (GCallback)act_sel_keep_moving_callback,
                       data, FALSE, NULL);
   }
 

Modified: branches/S2_6/client/gui-qt/dialogs.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/dialogs.cpp?rev=33403&r1=33402&r2=33403&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/dialogs.cpp     (original)
+++ branches/S2_6/client/gui-qt/dialogs.cpp     Mon Aug  1 02:40:23 2016
@@ -62,7 +62,7 @@
 extern void popdown_city_report();
 extern void popdown_endgame_report();
 
-static void diplomat_keep_moving(QVariant data1, QVariant data2);
+static void act_sel_keep_moving(QVariant data1, QVariant data2);
 static void diplomat_incite(QVariant data1, QVariant data2);
 static void spy_request_sabotage_list(QVariant data1, QVariant data2);
 static void spy_sabotage(QVariant data1, QVariant data2);
@@ -1400,7 +1400,7 @@
       || (!target_city && unit_has_type_flag(actor_unit, UTYF_CAPTURER))) {
     qv2 = target_tile->index;
 
-    func = diplomat_keep_moving;
+    func = act_sel_keep_moving;
     cd->add_item(QString(_("Keep moving")), func, qv1, qv2,
                  "", BUTTON_MOVE);
   }
@@ -1745,9 +1745,9 @@
 }
 
 /***************************************************************************
-  Action keep moving with diplomat for choice dialog
-***************************************************************************/
-static void diplomat_keep_moving(QVariant data1, QVariant data2)
+  Action keep moving with actor unit for choice dialog
+***************************************************************************/
+static void act_sel_keep_moving(QVariant data1, QVariant data2)
 {
   struct unit *punit;
   struct tile *ptile;

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=33403&r1=33402&r2=33403&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/action_dialog.c        (original)
+++ branches/S2_6/client/gui-sdl/action_dialog.c        Mon Aug  1 02:40:23 2016
@@ -678,11 +678,11 @@
 }
 
 /********************************************************************
-  Callback from diplomat/spy dialog for "keep moving".
+  Callback from action selection dialog for "keep moving".
   (This should only occur when entering a tile with an allied city
   or an allied unit.)
 *********************************************************************/
-static int diplomat_keep_moving_callback(struct widget *pWidget)
+static int act_sel_keep_moving_callback(struct widget *pWidget)
 {
   if (Main.event.button.button == SDL_BUTTON_LEFT) {
     struct unit *punit;
@@ -1020,7 +1020,7 @@
       || (!target_city && unit_has_type_flag(actor_unit, UTYF_CAPTURER))) {
     create_active_iconlabel(pBuf, pWindow->dst, pStr,
                             _("Keep moving"),
-                            diplomat_keep_moving_callback);
+                            act_sel_keep_moving_callback);
 
     pBuf->data.tile = target_tile;
 

Modified: branches/S2_6/client/gui-sdl2/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/action_dialog.c?rev=33403&r1=33402&r2=33403&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/action_dialog.c       (original)
+++ branches/S2_6/client/gui-sdl2/action_dialog.c       Mon Aug  1 02:40:23 2016
@@ -679,11 +679,11 @@
 }
 
 /********************************************************************
-  Callback from diplomat/spy dialog for "keep moving".
+  Callback from action selection dialog for "keep moving".
   (This should only occur when entering a tile with an allied city
   or an allied unit.)
 *********************************************************************/
-static int diplomat_keep_moving_callback(struct widget *pWidget)
+static int act_sel_keep_moving_callback(struct widget *pWidget)
 {
   if (Main.event.button.button == SDL_BUTTON_LEFT) {
     struct unit *punit;
@@ -1024,7 +1024,7 @@
       || (!target_city && unit_has_type_flag(actor_unit, UTYF_CAPTURER))) {
     create_active_iconlabel(pBuf, pWindow->dst, pstr,
                             _("Keep moving"),
-                            diplomat_keep_moving_callback);
+                            act_sel_keep_moving_callback);
 
     pBuf->data.tile = target_tile;
 

Modified: branches/S2_6/client/gui-xaw/action_dialog.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/action_dialog.c?rev=33403&r1=33402&r2=33403&view=diff
==============================================================================
--- branches/S2_6/client/gui-xaw/action_dialog.c        (original)
+++ branches/S2_6/client/gui-xaw/action_dialog.c        Mon Aug  1 02:40:23 2016
@@ -798,11 +798,11 @@
 
 
 /**************************************************************************
-  Callback from diplomat/spy dialog for "keep moving".
+  Callback from action selection dialog for "keep moving".
   (This should only occur when entering a tile that has an allied city or
   an allied unit.)
 **************************************************************************/
-static void diplomat_keep_moving_callback(Widget w,
+static void act_sel_keep_moving_callback(Widget w,
                                           XtPointer client_data,
                                           XtPointer call_data)
 {
@@ -911,7 +911,7 @@
                            diplomat_bribe_callback, 0, 0,
                            spy_sabotage_unit_callback, 0, 0,
                            spy_steal_gold_callback, 0, 0,
-                           diplomat_keep_moving_callback, target_tile, 1,
+                           act_sel_keep_moving_callback, target_tile, 1,
                            diplomat_cancel_callback, 0, 0,
                            NULL);
 


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

Reply via email to