Author: cazfi
Date: Sun May 10 11:38:52 2015
New Revision: 29033

URL: http://svn.gna.org/viewcvs/freeciv?rev=29033&view=rev
Log:
Sdl-clients no longer instruct observers to end turn when they cannot.

See bug #17703

Modified:
    branches/S2_5/client/gui-sdl/mapview.c

Modified: branches/S2_5/client/gui-sdl/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/mapview.c?rev=29033&r1=29032&r2=29033&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/mapview.c      (original)
+++ branches/S2_5/client/gui-sdl/mapview.c      Sun May 10 11:38:52 2015
@@ -900,7 +900,8 @@
        hide_scrollbar(pInfo_Window->private_data.adv_dlg->pScroll);
       }
 
-      if (NULL != client.conn.playing) {
+      if (!client_is_observer()
+          && (!client.conn.playing->ai_controlled || ai_manual_turn_done)) {
         char buf[256];
         fc_snprintf(buf, sizeof(buf), "%s\n%s\n%s",
                     _("End of Turn"), _("Press"), _("Shift+Return"));


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to