Author: sveinung
Date: Sun Jul 24 05:42:54 2016
New Revision: 33309
URL: http://svn.gna.org/viewcvs/freeciv?rev=33309&view=rev
Log:
Actions vs own tile isn't Diplomat only.
Rename key_unit_diplomat_actions() to key_unit_action_select(). This
reflects that it isn't diplomat only any longer.
See patch #7492
Modified:
branches/S2_6/client/control.c
branches/S2_6/client/control.h
branches/S2_6/client/gui-gtk-2.0/menu.c
branches/S2_6/client/gui-gtk-3.0/menu.c
branches/S2_6/client/gui-qt/menu.cpp
branches/S2_6/client/gui-sdl/menu.c
branches/S2_6/client/gui-sdl2/menu.c
branches/S2_6/client/gui-xaw/menu.c
branches/S2_6/client/gui-xaw/xaw_actions.c
Modified: branches/S2_6/client/control.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/control.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/control.c (original)
+++ branches/S2_6/client/control.c Sun Jul 24 05:42:54 2016
@@ -2907,7 +2907,7 @@
/**************************************************************************
Handle user 'diplomatic actions' input
**************************************************************************/
-void key_unit_diplomat_actions(void)
+void key_unit_action_select(void)
{
struct tile *ptile;
Modified: branches/S2_6/client/control.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/control.h?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/control.h (original)
+++ branches/S2_6/client/control.h Sun Jul 24 05:42:54 2016
@@ -227,7 +227,7 @@
void key_unit_build_wonder(void);
void key_unit_connect(enum unit_activity activity,
struct extra_type *tgt);
-void key_unit_diplomat_actions(void);
+void key_unit_action_select(void);
void key_unit_convert(void);
void key_unit_done(void);
void key_unit_fallout(void);
Modified: branches/S2_6/client/gui-gtk-2.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/menu.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/menu.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/menu.c Sun Jul 24 05:42:54 2016
@@ -1260,7 +1260,7 @@
*****************************************************************/
static void diplomat_action_callback(GtkAction *action, gpointer data)
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
/****************************************************************
Modified: branches/S2_6/client/gui-gtk-3.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/menu.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/menu.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/menu.c Sun Jul 24 05:42:54 2016
@@ -1253,7 +1253,7 @@
*****************************************************************/
static void diplomat_action_callback(GtkAction *action, gpointer data)
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
/****************************************************************
Modified: branches/S2_6/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/menu.cpp (original)
+++ branches/S2_6/client/gui-qt/menu.cpp Sun Jul 24 05:42:54 2016
@@ -2138,7 +2138,7 @@
***************************************************************************/
void mr_menu::slot_action()
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
Modified: branches/S2_6/client/gui-sdl/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/menu.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/menu.c (original)
+++ branches/S2_6/client/gui-sdl/menu.c Sun Jul 24 05:42:54 2016
@@ -234,7 +234,7 @@
popup_unit_disband_dlg(pUnit, FALSE);
break;
case ID_UNIT_ORDER_DIPLOMAT_DLG:
- key_unit_diplomat_actions();
+ key_unit_action_select();
break;
case ID_UNIT_ORDER_NUKE:
key_unit_nuke();
Modified: branches/S2_6/client/gui-sdl2/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/menu.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/menu.c (original)
+++ branches/S2_6/client/gui-sdl2/menu.c Sun Jul 24 05:42:54 2016
@@ -240,7 +240,7 @@
popup_unit_disband_dlg(pUnit, FALSE);
break;
case ID_UNIT_ORDER_DIPLOMAT_DLG:
- key_unit_diplomat_actions();
+ key_unit_action_select();
break;
case ID_UNIT_ORDER_NUKE:
key_unit_nuke();
Modified: branches/S2_6/client/gui-xaw/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/menu.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-xaw/menu.c (original)
+++ branches/S2_6/client/gui-xaw/menu.c Sun Jul 24 05:42:54 2016
@@ -900,7 +900,7 @@
key_unit_trade_route();
break;
case MENU_ORDER_DIPLOMAT_DLG:
- key_unit_diplomat_actions();
+ key_unit_action_select();
break;
case MENU_ORDER_NUKE:
key_unit_nuke();
Modified: branches/S2_6/client/gui-xaw/xaw_actions.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/xaw_actions.c?rev=33309&r1=33308&r2=33309&view=diff
==============================================================================
--- branches/S2_6/client/gui-xaw/xaw_actions.c (original)
+++ branches/S2_6/client/gui-xaw/xaw_actions.c Sun Jul 24 05:42:54 2016
@@ -510,7 +510,7 @@
static void xaw_key_unit_diplomat_spy_action(Widget w, XEvent *event, String
*argv, Cardinal *argc)
{
if(is_menu_item_active(MENU_ORDER, MENU_ORDER_DIPLOMAT_DLG))
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
static void xaw_key_unit_convert(Widget w, XEvent *event, String *argv,
Cardinal *argc)
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
