Author: jtn Date: Mon Jun 2 23:07:07 2014 New Revision: 25018 URL: http://svn.gna.org/viewcvs/freeciv?rev=25018&view=rev Log: Fix compilation of SDL clients, broken by patch #4727.
Reported by Marko Lindqvist (cazfi@gna). See gna bug #22129. Modified: trunk/client/gui-sdl/repodlgs.c trunk/client/gui-sdl2/repodlgs.c Modified: trunk/client/gui-sdl/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/repodlgs.c?rev=25018&r1=25017&r2=25018&view=diff ============================================================================== --- trunk/client/gui-sdl/repodlgs.c (original) +++ trunk/client/gui-sdl/repodlgs.c Mon Jun 2 23:07:07 2014 @@ -2633,11 +2633,11 @@ get_theme_color(COLOR_THEME_SCIENCEDLG_FRAME)); if (cost > adj_size(286)) { - cost = (adj_size(286) + cost = adj_size(286) * ((float) research_get(client_player())->bulbs_researched / cost); } else { - cost = ((float) cost + cost = (float) cost * ((float) research_get(client_player())->bulbs_researched / cost); } Modified: trunk/client/gui-sdl2/repodlgs.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/repodlgs.c?rev=25018&r1=25017&r2=25018&view=diff ============================================================================== --- trunk/client/gui-sdl2/repodlgs.c (original) +++ trunk/client/gui-sdl2/repodlgs.c Mon Jun 2 23:07:07 2014 @@ -2667,11 +2667,11 @@ #endif if (cost > adj_size(286)) { - cost = (adj_size(286) + cost = adj_size(286) * ((float) research_get(client_player())->bulbs_researched / cost); } else { - cost = ((float) cost + cost = (float) cost * ((float) research_get(client_player())->bulbs_researched / cost); } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits