<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39505 >
Changes required by #37611 to xaw.
Implementation is similar to what gtk has after #38016.
- ML
diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/actions.c freeciv/client/gui-xaw/actions.c
--- freeciv/client/gui-xaw/actions.c 2007-08-04 18:38:47.000000000 +0300
+++ freeciv/client/gui-xaw/actions.c 2007-08-07 19:48:51.000000000 +0300
@@ -460,7 +460,9 @@
static void xaw_key_unit_fortify_or_fortress(Widget w, XEvent *event, String *argv, Cardinal *argc)
{
unit_list_iterate(get_units_in_focus(), punit) {
- if (can_unit_do_activity(punit, ACTIVITY_FORTRESS)) {
+ struct base_type *pbase = get_base_by_gui_type(BASE_GUI_FORTRESS,
+ punit, punit->tile);
+ if (pbase != NULL) {
key_unit_fortress();
} else {
key_unit_fortify();
diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/menu.c freeciv/client/gui-xaw/menu.c
--- freeciv/client/gui-xaw/menu.c 2007-08-07 19:49:25.000000000 +0300
+++ freeciv/client/gui-xaw/menu.c 2007-08-07 19:43:50.000000000 +0300
@@ -390,9 +390,9 @@
menu_entry_sensitive(MENU_ORDER, MENU_ORDER_TRANSFORM,
can_units_do_activity(punits, ACTIVITY_TRANSFORM));
menu_entry_sensitive(MENU_ORDER, MENU_ORDER_FORTRESS,
- can_units_do_activity(punits, ACTIVITY_FORTRESS));
+ can_units_do_base_gui(punits, BASE_GUI_FORTRESS));
menu_entry_sensitive(MENU_ORDER, MENU_ORDER_AIRBASE,
- can_units_do_activity(punits, ACTIVITY_AIRBASE));
+ can_units_do_base_gui(punits, BASE_GUI_AIRBASE));
menu_entry_sensitive(MENU_ORDER, MENU_ORDER_POLLUTION,
can_units_do_activity(punits, ACTIVITY_POLLUTION)
|| can_units_do(punits, can_unit_paradrop));
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
