<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40470 >
$subject
- ML
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/dialogs.c
freeciv/client/gui-win32/dialogs.c
--- freeciv/client/gui-win32/dialogs.c 2008-06-18 18:49:40.000000000 +0300
+++ freeciv/client/gui-win32/dialogs.c 2008-08-29 00:50:27.000000000 +0300
@@ -1753,13 +1753,18 @@
fcwin_box_add_static(vbox,_("Select what to pillage:"),0,SS_LEFT,
FALSE,FALSE,10);
while ((what = get_preferred_pillage(may_pillage, pbase)) != S_LAST) {
- bv_special what_bv;
-
if (what != S_PILLAGE_BASE) {
+ bv_special what_bv;
+ bv_bases bases;
+
BV_CLR_ALL(what_bv);
BV_SET(what_bv, what);
+ BV_CLR_ALL(bases);
+ if (pbase) {
+ BV_SET(bases, base_index(pbase));
+ }
- fcwin_box_add_button(vbox, get_infrastructure_text(what_bv),
+ fcwin_box_add_button(vbox, get_infrastructure_text(what_bv, bases),
ID_PILLAGE_BASE+what,0,TRUE,FALSE,5);
clear_special(&may_pillage, what);
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/gui_main.c
freeciv/client/gui-win32/gui_main.c
--- freeciv/client/gui-win32/gui_main.c 2008-08-12 02:35:44.000000000 +0300
+++ freeciv/client/gui-win32/gui_main.c 2008-08-29 00:53:55.000000000 +0300
@@ -565,7 +565,7 @@
FD_SET(net_input, &civfdset);
tv.tv_sec = 0;
tv.tv_usec = 0;
- if (my_select(1, &civfdset, NULL, NULL, &tv)) {
+ if (fc_select(1, &civfdset, NULL, NULL, &tv)) {
if (FD_ISSET(net_input, &civfdset)) {
input_from_server(net_input);
processed = TRUE;
@@ -929,5 +929,5 @@
/****************************************************************************
Stub for editor function
****************************************************************************/
-void edtgui_notify_object_changed(int objtype, int object_id, bool remove)
+void editgui_notify_object_changed(int objtype, int object_id, bool remove)
{}
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
