Author: cazfi Date: Wed Mar 4 20:08:33 2015 New Revision: 28409 URL: http://svn.gna.org/viewcvs/freeciv?rev=28409&view=rev Log: Limit current research choice list to immediately available ones in sdl-clients' science dialog
See bug #23342 Modified: branches/S2_6/client/gui-sdl/repodlgs.c branches/S2_6/client/gui-sdl2/repodlgs.c Modified: branches/S2_6/client/gui-sdl/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/repodlgs.c?rev=28409&r1=28408&r2=28409&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl/repodlgs.c (original) +++ branches/S2_6/client/gui-sdl/repodlgs.c Wed Mar 4 20:08:33 2015 @@ -2839,7 +2839,7 @@ } /************************************************************************** - ... + Popup dialog to change current research. **************************************************************************/ static void popup_change_research_dialog(void) { @@ -2856,7 +2856,7 @@ } advance_index_iterate(A_FIRST, i) { - if (!research_invention_gettable(presearch, i, TRUE)) { + if (!research_invention_gettable(presearch, i, FALSE)) { continue; } count++; @@ -2924,7 +2924,7 @@ count = 0; h = col * max_row; advance_index_iterate(A_FIRST, i) { - if (!research_invention_gettable(presearch, i, TRUE)) { + if (!research_invention_gettable(presearch, i, FALSE)) { continue; } @@ -3025,7 +3025,7 @@ } /************************************************************************** - ... + Popup dialog to change research goal. **************************************************************************/ static void popup_change_research_goal_dialog(void) { @@ -3329,7 +3329,7 @@ /* current research goal icon */ pTechIcon = get_tech_icon(presearch->tech_goal); pChangeResearchGoalButton = create_icon2(pTechIcon, pWindow->dst, WF_RESTORE_BACKGROUND | WF_FREE_THEME); - + pChangeResearchGoalButton->action = popup_change_research_goal_dialog_callback; if (count > 0) { set_wstate(pChangeResearchGoalButton, FC_WS_NORMAL); Modified: branches/S2_6/client/gui-sdl2/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/repodlgs.c?rev=28409&r1=28408&r2=28409&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl2/repodlgs.c (original) +++ branches/S2_6/client/gui-sdl2/repodlgs.c Wed Mar 4 20:08:33 2015 @@ -2854,7 +2854,7 @@ } /************************************************************************** - ... + Popup dialog to change current research. **************************************************************************/ static void popup_change_research_dialog(void) { @@ -2871,7 +2871,7 @@ } advance_index_iterate(A_FIRST, i) { - if (!research_invention_gettable(presearch, i, TRUE)) { + if (!research_invention_gettable(presearch, i, FALSE)) { continue; } count++; @@ -2939,7 +2939,7 @@ count = 0; h = col * max_row; advance_index_iterate(A_FIRST, i) { - if (!research_invention_gettable(presearch, i, TRUE)) { + if (!research_invention_gettable(presearch, i, FALSE)) { continue; } @@ -3040,7 +3040,7 @@ } /************************************************************************** - ... + Popup dialog to change research goal. **************************************************************************/ static void popup_change_research_goal_dialog(void) { @@ -3345,7 +3345,7 @@ /* current research goal icon */ pTechIcon = get_tech_icon(presearch->tech_goal); pChangeResearchGoalButton = create_icon2(pTechIcon, pWindow->dst, WF_RESTORE_BACKGROUND | WF_FREE_THEME); - + pChangeResearchGoalButton->action = popup_change_research_goal_dialog_callback; if (count > 0) { set_wstate(pChangeResearchGoalButton, FC_WS_NORMAL); _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits