Project: Freeciv

Revision: 15186

Author: cazfi

Date: 28 Aug 2008 17:56:09

• /branches/S2_2/client/gui-win32/gui_main.c

  ......	@@ -565,7 +565,7 @@
  565	565	FD_SET(net_input, &civfdset);
  566	566	tv.tv_sec = 0;
  567	567	tv.tv_usec = 0;
  568		if (my_select(1, &civfdset, NULL, NULL, &tv)) {
  	568	if (fc_select(1, &civfdset, NULL, NULL, &tv)) {
  569	569	if (FD_ISSET(net_input, &civfdset)) {
  570	570	input_from_server(net_input);
  571	571	processed = TRUE;
  ......	@@ -929,5 +929,5 @@
  929	929	/****************************************************************************
  930	930	Stub for editor function
  931	931	****************************************************************************/
  932		void edtgui_notify_object_changed(int objtype, int object_id, bool remove)
  	932	void editgui_notify_object_changed(int objtype, int object_id, bool remove)
  933	933	{}

• /branches/S2_2/client/gui-win32/dialogs.c

  ......	@@ -1753,13 +1753,18 @@
  1753	1753	fcwin_box_add_static(vbox,_("Select what to pillage:"),0,SS_LEFT,
  1754	1754	FALSE,FALSE,10);
  1755	1755	while ((what = get_preferred_pillage(may_pillage, pbase)) != S_LAST) {
  1756		bv_special what_bv;
  1757
  1758	1756	if (what != S_PILLAGE_BASE) {
  	1757	bv_special what_bv;
  	1758	bv_bases bases;
  	1759
  1759	1760	BV_CLR_ALL(what_bv);
  1760	1761	BV_SET(what_bv, what);
  	1762	BV_CLR_ALL(bases);
  	1763	if (pbase) {
  	1764	BV_SET(bases, base_index(pbase));
  	1765	}
  1761	1766
  1762		fcwin_box_add_button(vbox, get_infrastructure_text(what_bv),
  	1767	fcwin_box_add_button(vbox, get_infrastructure_text(what_bv, bases),
  1763	1768	ID_PILLAGE_BASE+what,0,TRUE,FALSE,5);
  1764	1769
  1765	1770	clear_special(&may_pillage, what);