Author: sveinung
Date: Sun Jul 24 05:22:30 2016
New Revision: 33305
URL: http://svn.gna.org/viewcvs/freeciv?rev=33305&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:
trunk/client/control.c
trunk/client/control.h
trunk/client/gui-gtk-2.0/menu.c
trunk/client/gui-gtk-3.0/menu.c
trunk/client/gui-gtk-3.x/menu.c
trunk/client/gui-qt/menu.cpp
trunk/client/gui-sdl2/menu.c
Modified: trunk/client/control.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/control.c (original)
+++ trunk/client/control.c Sun Jul 24 05:22:30 2016
@@ -3005,7 +3005,7 @@
/**************************************************************************
Handle user 'diplomatic actions' input
**************************************************************************/
-void key_unit_diplomat_actions(void)
+void key_unit_action_select(void)
{
struct tile *ptile;
Modified: trunk/client/control.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/control.h?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/control.h (original)
+++ trunk/client/control.h Sun Jul 24 05:22:30 2016
@@ -228,7 +228,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: trunk/client/gui-gtk-2.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/menu.c?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/menu.c (original)
+++ trunk/client/gui-gtk-2.0/menu.c Sun Jul 24 05:22:30 2016
@@ -1270,7 +1270,7 @@
*****************************************************************/
static void diplomat_action_callback(GtkAction *action, gpointer data)
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
/****************************************************************
Modified: trunk/client/gui-gtk-3.0/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/menu.c?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Sun Jul 24 05:22:30 2016
@@ -1709,7 +1709,7 @@
*****************************************************************/
static void diplomat_action_callback(GtkMenuItem *action, gpointer data)
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
/****************************************************************
Modified: trunk/client/gui-gtk-3.x/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/menu.c?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/menu.c (original)
+++ trunk/client/gui-gtk-3.x/menu.c Sun Jul 24 05:22:30 2016
@@ -1708,7 +1708,7 @@
*****************************************************************/
static void diplomat_action_callback(GtkMenuItem *action, gpointer data)
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
/****************************************************************
Modified: trunk/client/gui-qt/menu.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/menu.cpp?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/gui-qt/menu.cpp (original)
+++ trunk/client/gui-qt/menu.cpp Sun Jul 24 05:22:30 2016
@@ -2326,7 +2326,7 @@
***************************************************************************/
void mr_menu::slot_action()
{
- key_unit_diplomat_actions();
+ key_unit_action_select();
}
/***************************************************************************
Modified: trunk/client/gui-sdl2/menu.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/menu.c?rev=33305&r1=33304&r2=33305&view=diff
==============================================================================
--- trunk/client/gui-sdl2/menu.c (original)
+++ trunk/client/gui-sdl2/menu.c Sun Jul 24 05:22:30 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();
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
