Author: sveinung
Date: Thu Jan 1 10:42:21 2015
New Revision: 27469
URL: http://svn.gna.org/viewcvs/freeciv?rev=27469&view=rev
Log:
Gtk clients: ability to help wonder names menu item.
Name menu item based on the ability to do the Help Wonder Action rather
than the presence of the HelpWonder unit type flag.
See patch #5625
Modified:
trunk/client/gui-gtk-2.0/menu.c
trunk/client/gui-gtk-3.0/menu.c
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=27469&r1=27468&r2=27469&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/menu.c (original)
+++ trunk/client/gui-gtk-2.0/menu.c Thu Jan 1 10:42:21 2015
@@ -2273,7 +2273,7 @@
menus_set_sensitive(unit_group, "EXPLODE_NUKE",
units_have_type_flag(punits, UTYF_NUCLEAR, TRUE));
- if (units_have_type_flag(punits, UTYF_HELP_WONDER, TRUE)) {
+ if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
menus_rename(unit_group, "BUILD_CITY", _("Help _Build Wonder"));
} else {
bool city_on_tile = FALSE;
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=27469&r1=27468&r2=27469&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/menu.c (original)
+++ trunk/client/gui-gtk-3.0/menu.c Thu Jan 1 10:42:21 2015
@@ -2274,7 +2274,7 @@
menus_set_sensitive(unit_group, "EXPLODE_NUKE",
units_have_type_flag(punits, UTYF_NUCLEAR, TRUE));
- if (units_have_type_flag(punits, UTYF_HELP_WONDER, TRUE)) {
+ if (units_can_do_action(punits, ACTION_HELP_WONDER, TRUE)) {
menus_rename(unit_group, "BUILD_CITY", _("Help _Build Wonder"));
} else {
bool city_on_tile = FALSE;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
