Author: cazfi Date: Sun May 10 11:38:44 2015 New Revision: 29032 URL: http://svn.gna.org/viewcvs/freeciv?rev=29032&view=rev Log: Sdl-clients no longer instruct observers to end turn when they cannot.
See bug #17703 Modified: branches/S2_6/client/gui-sdl/mapview.c branches/S2_6/client/gui-sdl2/mapview.c Modified: branches/S2_6/client/gui-sdl/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapview.c?rev=29032&r1=29031&r2=29032&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl/mapview.c (original) +++ branches/S2_6/client/gui-sdl/mapview.c Sun May 10 11:38:44 2015 @@ -909,7 +909,8 @@ hide_scrollbar(pInfo_Window->private_data.adv_dlg->pScroll); } - if (NULL != client.conn.playing) { + if (!client_is_observer() + && (!client.conn.playing->ai_controlled || options.ai_manual_turn_done)) { char buf[256]; fc_snprintf(buf, sizeof(buf), "%s\n%s\n%s", _("End of Turn"), _("Press"), _("Shift+Return")); Modified: branches/S2_6/client/gui-sdl2/mapview.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapview.c?rev=29032&r1=29031&r2=29032&view=diff ============================================================================== --- branches/S2_6/client/gui-sdl2/mapview.c (original) +++ branches/S2_6/client/gui-sdl2/mapview.c Sun May 10 11:38:44 2015 @@ -922,7 +922,8 @@ hide_scrollbar(pInfo_Window->private_data.adv_dlg->pScroll); } - if (NULL != client.conn.playing) { + if (!client_is_observer() + && (!client.conn.playing->ai_controlled || options.ai_manual_turn_done)) { char buf[256]; fc_snprintf(buf, sizeof(buf), "%s\n%s\n%s", _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits