Author: sveinung
Date: Mon Aug 1 02:33:34 2016
New Revision: 33402
URL: http://svn.gna.org/viewcvs/freeciv?rev=33402&view=rev
Log:
act sel dlg: keep moving isn't Diplomat only.
See patch #7521
Modified:
trunk/client/gui-gtk-2.0/action_dialog.c
trunk/client/gui-gtk-3.0/action_dialog.c
trunk/client/gui-gtk-3.x/action_dialog.c
trunk/client/gui-qt/dialogs.cpp
trunk/client/gui-sdl2/action_dialog.c
Modified: trunk/client/gui-gtk-2.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/action_dialog.c (original)
+++ trunk/client/gui-gtk-2.0/action_dialog.c Mon Aug 1 02:33:34 2016
@@ -1132,11 +1132,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;
@@ -1481,7 +1481,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: trunk/client/gui-gtk-3.0/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/action_dialog.c (original)
+++ trunk/client/gui-gtk-3.0/action_dialog.c Mon Aug 1 02:33:34 2016
@@ -1224,11 +1224,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;
@@ -1573,7 +1573,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: trunk/client/gui-gtk-3.x/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/action_dialog.c (original)
+++ trunk/client/gui-gtk-3.x/action_dialog.c Mon Aug 1 02:33:34 2016
@@ -1218,11 +1218,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;
@@ -1567,7 +1567,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: trunk/client/gui-qt/dialogs.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/dialogs.cpp?rev=33402&r1=33401&r2=33402&view=diff
==============================================================================
--- trunk/client/gui-qt/dialogs.cpp (original)
+++ trunk/client/gui-qt/dialogs.cpp Mon Aug 1 02:33:34 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);
@@ -1525,7 +1525,7 @@
if (unit_can_move_to_tile(actor_unit, target_tile, FALSE)) {
qv2 = target_tile->index;
- func = diplomat_keep_moving;
+ func = act_sel_keep_moving;
cd->add_item(QString(_("Keep moving")), func, qv1, qv2,
"", BUTTON_MOVE);
}
@@ -2025,9 +2025,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: trunk/client/gui-sdl2/action_dialog.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/action_dialog.c?rev=33402&r1=33401&r2=33402&view=diff
==============================================================================
--- trunk/client/gui-sdl2/action_dialog.c (original)
+++ trunk/client/gui-sdl2/action_dialog.c Mon Aug 1 02:33:34 2016
@@ -761,11 +761,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;
@@ -1336,7 +1336,7 @@
if (unit_can_move_to_tile(actor_unit, target_tile, FALSE)) {
create_active_iconlabel(pBuf, pWindow->dst, pstr,
_("Keep moving"),
- diplomat_keep_moving_callback);
+ act_sel_keep_moving_callback);
pBuf->data.tile = target_tile;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
