<URL: http://bugs.freeciv.org/Ticket/Display.html?id=37937 >
> [dmarks - So 11. Mär 2007, 09:00:45]:
>
> The SDL client lacks support for the Load unit command. In the GTK2
> client, 'L' is the shortcut for this command, but in the SDL client,
> it is mapped as Goto city.
>
> ~Daniel
>
Patch attached. We don't have an icon for the order button yet, so it's
just an empty button for now.
Index: data/themes/gui-sdl/human/theme_orders_buttons.spec
===================================================================
--- data/themes/gui-sdl/human/theme_orders_buttons.spec (Revision 12918)
+++ data/themes/gui-sdl/human/theme_orders_buttons.spec (Arbeitskopie)
@@ -63,7 +63,7 @@
33, 0, "theme.order_wakeup"
34, 0, "theme.order_return"
35, 0, "theme.order_airlift"
-; 36, 0, "theme.order_"
+ 36, 0, "theme.order_load"
; 37, 0, "theme.order_"
; 38, 0, "theme.order_"
39, 0, "theme.order_empty"
Index: client/gui-sdl/optiondlg.c
===================================================================
--- client/gui-sdl/optiondlg.c (Revision 12918)
+++ client/gui-sdl/optiondlg.c (Arbeitskopie)
@@ -487,7 +487,7 @@
update_info_label();
update_unit_info_label(get_units_in_focus());
center_on_something();/* with redrawing full map */
- update_order_widget();
+ update_order_widgets();
redraw_group(pOption_Dlg->pBeginOptionsWidgetList,
pOption_Dlg->pEndOptionsWidgetList, 0);
Index: client/gui-sdl/gui_tilespec.c
===================================================================
--- client/gui-sdl/gui_tilespec.c (Revision 12918)
+++ client/gui-sdl/gui_tilespec.c (Arbeitskopie)
@@ -352,6 +352,7 @@
load_order_theme_surface(pBuf, OWakeUp_Icon, "theme.order_wakeup");
load_order_theme_surface(pBuf, OReturn_Icon, "theme.order_return");
load_order_theme_surface(pBuf, OAirLift_Icon, "theme.order_airlift");
+ load_order_theme_surface(pBuf, OLoad_Icon, "theme.order_load");
/* ------------------------------ */
@@ -464,6 +465,7 @@
FREESURFACE(pTheme->OWakeUp_Icon);
FREESURFACE(pTheme->OReturn_Icon);
FREESURFACE(pTheme->OAirLift_Icon);
+ FREESURFACE(pTheme->OLoad_Icon);
FC_FREE(pTheme);
return;
Index: client/gui-sdl/gui_tilespec.h
===================================================================
--- client/gui-sdl/gui_tilespec.h (Revision 12918)
+++ client/gui-sdl/gui_tilespec.h (Arbeitskopie)
@@ -136,6 +136,7 @@
SDL_Surface *OWakeUp_Icon;
SDL_Surface *OReturn_Icon;
SDL_Surface *OAirLift_Icon;
+ SDL_Surface *OLoad_Icon;
};
Index: client/gui-sdl/menu.c
===================================================================
--- client/gui-sdl/menu.c (Revision 12918)
+++ client/gui-sdl/menu.c (Arbeitskopie)
@@ -139,14 +139,26 @@
case ID_UNIT_ORDER_HOMECITY:
key_unit_homecity();
break;
- case ID_UNIT_ORDER_UNLOAD:
+ case ID_UNIT_ORDER_UNLOAD_TRANSPORTER:
key_unit_unload_all();
break;
+ case ID_UNIT_ORDER_LOAD:
+ unit_list_iterate(get_units_in_focus(), punit) {
+ request_unit_load(punit, NULL);
+ } unit_list_iterate_end;
+ break;
+ case ID_UNIT_ORDER_UNLOAD:
+ unit_list_iterate(get_units_in_focus(), punit) {
+ request_unit_unload(punit);
+ } unit_list_iterate_end;
+ break;
case ID_UNIT_ORDER_WAKEUP_OTHERS:
key_unit_wakeup_others();
break;
- case ID_UNIT_ORDER_AUTOMATION:
- request_unit_autosettlers(pUnit);
+ case ID_UNIT_ORDER_AUTO_SETTLER:
+ unit_list_iterate(get_units_in_focus(), punit) {
+ request_unit_autosettlers(punit);
+ } unit_list_iterate_end;
break;
case ID_UNIT_ORDER_AUTO_EXPLORE:
key_unit_auto_explore();
@@ -173,7 +185,9 @@
popup_airlift_dialog();
break;
case ID_UNIT_ORDER_RETURN:
- request_unit_return(pUnit);
+ unit_list_iterate(get_units_in_focus(), punit) {
+ request_unit_return(punit);
+ } unit_list_iterate_end;
break;
case ID_UNIT_ORDER_UPGRADE:
popup_unit_upgrade_dlg(pUnit, FALSE);
@@ -420,7 +434,7 @@
/* --------- */
/* Upgrade */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Upgrade"), "Shift+U");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Upgrade"), "Ctrl+U");
pBuf = create_themeicon(pTheme->Order_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -428,12 +442,12 @@
pBuf->action = unit_order_callback;
pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
pBuf->key = SDLK_u;
- pBuf->mod = KMOD_SHIFT;
+ pBuf->mod = KMOD_CTRL;
add_to_gui_list(ID_UNIT_ORDER_UPGRADE, pBuf);
/* --------- */
/* Return to nearest city */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Return to nearest city"), "Shift+G");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Return To Nearest City"), "Shift+G");
pBuf = create_themeicon(pTheme->OReturn_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -446,25 +460,27 @@
/* --------- */
/* Goto City */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Goto City"), "L");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Goto City"), "Ctrl+G");
pBuf = create_themeicon(pTheme->OGotoCity_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
set_wstate(pBuf, FC_WS_NORMAL);
pBuf->action = unit_order_callback;
pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
+ pBuf->mod = KMOD_CTRL;
pBuf->key = SDLK_l;
add_to_gui_list(ID_UNIT_ORDER_GOTO_CITY, pBuf);
/* --------- */
/* Airlift */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Airlift"), "L");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Airlift"), "Shift+L");
pBuf = create_themeicon(pTheme->Order_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
set_wstate(pBuf, FC_WS_NORMAL);
pBuf->action = unit_order_callback;
pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
+ pBuf->mod = KMOD_SHIFT;
pBuf->key = SDLK_l;
add_to_gui_list(ID_UNIT_ORDER_AIRLIFT, pBuf);
/* --------- */
@@ -494,7 +510,7 @@
/* --------- */
/* Connect irrigation */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Connect irrigation"), "Shift+I");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Connect irrigation"), "Ctrl+Shift+I");
pBuf = create_themeicon(pTheme->OAutoConnect_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -502,12 +518,12 @@
pBuf->action = unit_order_callback;
pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
pBuf->key = SDLK_i;
- pBuf->mod = KMOD_SHIFT;
+ pBuf->mod = KMOD_CTRL | KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_CONNECT_IRRIGATE, pBuf);
/* --------- */
/* Connect road */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Connect road"), "Shift+R");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Connect road"), "Ctrl+Shift+R");
pBuf = create_themeicon(pTheme->OAutoConnect_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -515,12 +531,12 @@
pBuf->action = unit_order_callback;
pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
pBuf->key = SDLK_r;
- pBuf->mod = KMOD_SHIFT;
+ pBuf->mod = KMOD_CTRL | KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_CONNECT_ROAD, pBuf);
/* --------- */
/* Connect railroad */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Connect railroad"), "Shift+L");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Connect railroad"), "Ctrl+Shift+L");
pBuf = create_themeicon(pTheme->OAutoConnect_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -528,12 +544,12 @@
pBuf->action = unit_order_callback;
pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
pBuf->key = SDLK_l;
- pBuf->mod = KMOD_SHIFT;
+ pBuf->mod = KMOD_CTRL | KMOD_SHIFT;
add_to_gui_list(ID_UNIT_ORDER_CONNECT_RAILROAD, pBuf);
/* --------- */
/* Auto-Explore */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto-Explore"), "X");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto Explore"), "X");
pBuf = create_themeicon(pTheme->OAutoExp_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -546,9 +562,9 @@
/* --------- */
/* Auto-Attack / Auto-Settler */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto-Attack"), "A");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto Attack"), "A");
len = strlen(cBuf);
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto-Settler"), "A");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto Settler"), "A");
len = MAX(len, strlen(cBuf));
pBuf = create_themeicon(pTheme->OAutoSett_Icon, Main.gui,
@@ -561,7 +577,7 @@
convertcopy_to_utf16(unibuf, len, cBuf);
pBuf->string16 = create_string16(unibuf, len, adj_font(10));
pBuf->key = SDLK_a;
- add_to_gui_list(ID_UNIT_ORDER_AUTOMATION, pBuf);
+ add_to_gui_list(ID_UNIT_ORDER_AUTO_SETTLER, pBuf);
pOrder_Automate_Unit_Button = pBuf;
/* --------- */
@@ -580,6 +596,31 @@
/* --------- */
/* Unload */
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Unload Transporter"), "Shift+U");
+ pBuf = create_themeicon(pTheme->OUnload_Icon, Main.gui,
+ (WF_HIDDEN | WF_RESTORE_BACKGROUND |
+ WF_WIDGET_HAS_INFO_LABEL));
+ set_wstate(pBuf, FC_WS_NORMAL);
+ pBuf->action = unit_order_callback;
+ pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
+ pBuf->mod = KMOD_SHIFT;
+ pBuf->key = SDLK_u;
+ add_to_gui_list(ID_UNIT_ORDER_UNLOAD_TRANSPORTER, pBuf);
+ /* --------- */
+
+ /* Load */
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Load"), "L");
+ pBuf = create_themeicon(pTheme->OLoad_Icon, Main.gui,
+ (WF_HIDDEN | WF_RESTORE_BACKGROUND |
+ WF_WIDGET_HAS_INFO_LABEL));
+ set_wstate(pBuf, FC_WS_NORMAL);
+ pBuf->action = unit_order_callback;
+ pBuf->string16 = create_str16_from_char(cBuf, adj_font(10));
+ pBuf->key = SDLK_l;
+ add_to_gui_list(ID_UNIT_ORDER_LOAD, pBuf);
+ /* --------- */
+
+ /* Unload */
my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Unload"), "U");
pBuf = create_themeicon(pTheme->OUnload_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
@@ -592,7 +633,7 @@
/* --------- */
/* Find Homecity */
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Find Homecity"), "H");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Make Homecity"), "H");
pBuf = create_themeicon(pTheme->OHomeCity_Icon, Main.gui,
(WF_HIDDEN | WF_RESTORE_BACKGROUND |
WF_WIDGET_HAS_INFO_LABEL));
@@ -795,7 +836,7 @@
/* Add to City / Build New City */
my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Add to City"), "B");
len = strlen(cBuf);
- my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Build New City"), "B");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Build City"), "B");
len = MAX(len, strlen(cBuf));
pBuf = create_themeicon(pTheme->OBuildCity_Icon, Main.gui,
@@ -833,7 +874,7 @@
/**************************************************************************
...
**************************************************************************/
-void update_order_widget(void)
+void update_order_widgets(void)
{
set_new_order_widget_start_pos();
redraw_order_widgets();
@@ -889,6 +930,7 @@
void update_menus(void)
{
static Uint16 counter = 0;
+ struct unit_list *punits = NULL;
struct unit *pUnit = NULL;
static char cBuf[128];
@@ -953,7 +995,8 @@
counter = 0;
}
- pUnit = unit_list_get(get_units_in_focus(), 0);
+ punits = get_units_in_focus();
+ pUnit = unit_list_get(punits, 0);
if (pUnit && !pUnit->ai.control) {
struct city *pHomecity;
@@ -973,9 +1016,9 @@
if (can_unit_add_or_build_city(pUnit)) {
if(pTile->city) {
- my_snprintf(cBuf, sizeof(cBuf),"%s%s", _("Add to City"), " (B)");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Add to City"), "B");
} else {
- my_snprintf(cBuf, sizeof(cBuf),"%s%s", _("Build New City"), " (B)");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Build City"), "B");
}
copy_chars_to_string16(pOrder_Build_AddTo_City_Button->string16, cBuf);
clear_wflag(pOrder_Build_AddTo_City_Button, WF_HIDDEN);
@@ -993,14 +1036,14 @@
if (can_unit_do_activity(pUnit, ACTIVITY_ROAD) || time) {
if(time) {
time = tile_activity_time(ACTIVITY_RAILROAD, pUnit->tile);
- my_snprintf(cBuf, sizeof(cBuf),"%s%s %d %s",
- _("Build Railroad"), " (R)", time ,
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s) %d %s",
+ _("Build Railroad"), "R", time ,
PL_("turn", "turns", time));
pOrder_Road_Button->theme = pTheme->ORailRoad_Icon;
} else {
time = tile_activity_time(ACTIVITY_ROAD, pUnit->tile);
- my_snprintf(cBuf, sizeof(cBuf),"%s%s %d %s",
- _("Build Road"), " (R)", time ,
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s) %d %s",
+ _("Build Road"), "R", time ,
PL_("turn", "turns", time));
pOrder_Road_Button->theme = pTheme->ORoad_Icon;
}
@@ -1018,13 +1061,14 @@
if (can_establish_trade_route(pHomecity, pTile->city)) {
my_snprintf(cBuf, sizeof(cBuf),
- _("Form Traderoute with %s ( %d R&G + %d trade ) (R)"),
+ _("Form Traderoute with %s ( %d R&G + %d trade ) (%s)"),
pHomecity->name, revenue,
- trade_between_cities(pHomecity, pTile->city));
+ trade_between_cities(pHomecity, pTile->city), "R");
} else {
revenue = (revenue + 2) / 3;
my_snprintf(cBuf, sizeof(cBuf),
- _("Trade with %s ( %d R&G bonus ) (R)"), pHomecity->name, revenue);
+ _("Trade with %s ( %d R&G bonus ) (%s)"),
+ pHomecity->name, revenue, "R");
}
copy_chars_to_string16(pOrder_Trade_Button->string16, cBuf);
clear_wflag(pOrder_Trade_Button, WF_HIDDEN);
@@ -1038,21 +1082,21 @@
if (!strcmp(pTile->terrain->name, "Forest") ||
!strcmp(pTile->terrain->name, "Jungle")) {
/* set Crop Forest Icon */
- my_snprintf(cBuf, sizeof(cBuf),"%s %s%s %d %s",
+ my_snprintf(cBuf, sizeof(cBuf),"%s %s (%s) %d %s",
_("Cut Down to"),
pTile->terrain->irrigation_result->name
- ," (I)", time , PL_("turn", "turns", time));
+ ,"I", time , PL_("turn", "turns", time));
pOrder_Irrigation_Button->theme = pTheme->OCutDownForest_Icon;
} else if (!strcmp(pTile->terrain->name, "Swamp")) {
- my_snprintf(cBuf, sizeof(cBuf),"%s %s%s %d %s",
+ my_snprintf(cBuf, sizeof(cBuf),"%s %s (%s) %d %s",
_("Irrigate to"),
pTile->terrain->irrigation_result->name
- ," (I)", time , PL_("turn", "turns", time));
+ ,"I", time , PL_("turn", "turns", time));
pOrder_Irrigation_Button->theme = pTheme->OIrrigation_Icon;
} else {
/* set Irrigation Icon */
- my_snprintf(cBuf, sizeof(cBuf),"%s%s %d %s",
- _("Build Irrigation"), " (I)", time ,
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s) %d %s",
+ _("Build Irrigation"), "I", time ,
PL_("turn", "turns", time));
pOrder_Irrigation_Button->theme = pTheme->OIrrigation_Icon;
}
@@ -1068,25 +1112,25 @@
if (!strcmp(pTile->terrain->name, "Forest")) {
/* set Irrigate Icon -> make swamp */
- my_snprintf(cBuf, sizeof(cBuf),"%s %s%s %d %s",
+ my_snprintf(cBuf, sizeof(cBuf),"%s %s (%s) %d %s",
_("Irrigate to"),
pTile->terrain->mining_result->name
- ," (M)", time , PL_("turn", "turns", time));
+ ,"M", time , PL_("turn", "turns", time));
pOrder_Mine_Button->theme = pTheme->OIrrigation_Icon;
} else if (!strcmp(pTile->terrain->name, "Jungle") ||
!strcmp(pTile->terrain->name, "Plains") ||
!strcmp(pTile->terrain->name, "Grassland") ||
!strcmp(pTile->terrain->name, "Swamp")) {
/* set Forest Icon -> plant Forrest*/
- my_snprintf(cBuf, sizeof(cBuf),"%s%s %d %s",
- _("Plant Forest"), " (M)", time ,
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s) %d %s",
+ _("Plant Forest"), "M", time ,
PL_("turn", "turns", time));
pOrder_Mine_Button->theme = pTheme->OPlantForest_Icon;
} else {
/* set Mining Icon */
- my_snprintf(cBuf, sizeof(cBuf),"%s%s %d %s",
- _("Build Mine"), " (M)", time ,
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s) %d %s",
+ _("Build Mine"), "M", time ,
PL_("turn", "turns", time));
pOrder_Mine_Button->theme = pTheme->OMine_Icon;
}
@@ -1099,10 +1143,10 @@
if (can_unit_do_activity(pUnit, ACTIVITY_TRANSFORM)) {
time = tile_activity_time(ACTIVITY_TRANSFORM, pUnit->tile);
- my_snprintf(cBuf, sizeof(cBuf),"%s %s%s %d %s",
+ my_snprintf(cBuf, sizeof(cBuf),"%s %s (%s) %d %s",
_("Transform to"),
pTile->terrain->transform_result->name,
- " (M)", time ,
+ "M", time ,
PL_("turn", "turns", time));
copy_chars_to_string16(pOrder_Transform_Button->string16, cBuf);
clear_wflag(pOrder_Transform_Button, WF_HIDDEN);
@@ -1166,11 +1210,23 @@
}
if (pUnit->occupy && get_transporter_occupancy(pUnit) > 0) {
- local_show(ID_UNIT_ORDER_UNLOAD);
+ local_show(ID_UNIT_ORDER_UNLOAD_TRANSPORTER);
} else {
- local_hide(ID_UNIT_ORDER_UNLOAD);
+ local_hide(ID_UNIT_ORDER_UNLOAD_TRANSPORTER);
}
+ if (units_can_load(punits)) {
+ local_show(ID_UNIT_ORDER_LOAD);
+ } else {
+ local_hide(ID_UNIT_ORDER_LOAD);
+ }
+
+ if (units_can_unload(punits)) {
+ local_show(ID_UNIT_ORDER_UNLOAD);
+ } else {
+ local_hide(ID_UNIT_ORDER_UNLOAD);
+ }
+
if (is_unit_activity_on_tile(ACTIVITY_SENTRY, pUnit->tile)) {
local_show(ID_UNIT_ORDER_WAKEUP_OTHERS);
} else {
@@ -1180,13 +1236,13 @@
if (can_unit_do_autosettlers(pUnit)) {
if (unit_flag(pUnit, F_SETTLERS)) {
if(pOrder_Automate_Unit_Button->theme != pTheme->OAutoSett_Icon) {
- my_snprintf(cBuf, sizeof(cBuf),"%s%s", _("Auto-Settler"), " (A)");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto Settler"), "A");
pOrder_Automate_Unit_Button->theme = pTheme->OAutoSett_Icon;
copy_chars_to_string16(pOrder_Automate_Unit_Button->string16, cBuf);
}
} else {
if(pOrder_Automate_Unit_Button->theme != pTheme->OAutoAtt_Icon) {
- my_snprintf(cBuf, sizeof(cBuf),"%s%s", _("Auto-Attack"), " (A)");
+ my_snprintf(cBuf, sizeof(cBuf),"%s (%s)", _("Auto Attack"), "A");
pOrder_Automate_Unit_Button->theme = pTheme->OAutoAtt_Icon;
copy_chars_to_string16(pOrder_Automate_Unit_Button->string16, cBuf);
}
Index: client/gui-sdl/gui_id.h
===================================================================
--- client/gui-sdl/gui_id.h (Revision 12918)
+++ client/gui-sdl/gui_id.h (Arbeitskopie)
@@ -148,9 +148,11 @@
ID_UNIT_ORDER_SENTRY,
ID_UNIT_ORDER_PILLAGE,
ID_UNIT_ORDER_HOMECITY,
+ ID_UNIT_ORDER_UNLOAD_TRANSPORTER,
+ ID_UNIT_ORDER_LOAD,
ID_UNIT_ORDER_UNLOAD,
ID_UNIT_ORDER_WAKEUP_OTHERS,
- ID_UNIT_ORDER_AUTOMATION,
+ ID_UNIT_ORDER_AUTO_SETTLER,
ID_UNIT_ORDER_AUTO_EXPLORE,
ID_UNIT_ORDER_CONNECT_ROAD,
ID_UNIT_ORDER_CONNECT_RAILROAD,
Index: client/gui-sdl/menu.h
===================================================================
--- client/gui-sdl/menu.h (Revision 12918)
+++ client/gui-sdl/menu.h (Arbeitskopie)
@@ -26,7 +26,7 @@
void create_units_order_widgets(void);
void delete_units_order_widgets(void);
-void update_order_widget(void);
+void update_order_widgets(void);
void undraw_order_widgets(void);
void free_bcgd_order_widgets(void);
void disable_order_buttons(void);
Index: client/gui-sdl/mapctrl.c
===================================================================
--- client/gui-sdl/mapctrl.c (Revision 12918)
+++ client/gui-sdl/mapctrl.c (Arbeitskopie)
@@ -346,7 +346,7 @@
}
if (get_num_units_in_focus() > 0) {
- update_order_widget();
+ update_order_widgets();
}
flush_dirty();
@@ -481,7 +481,7 @@
}
if (pFocus) {
- update_order_widget();
+ update_order_widgets();
}
flush_dirty();
_______________________________________________
Freeciv-dev mailing list
[EMAIL PROTECTED]
https://mail.gna.org/listinfo/freeciv-dev
