Author: cazfi
Date: Sun May 10 11:38:35 2015
New Revision: 29031

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

See bug #17703

Modified:
    trunk/client/gui-sdl/mapview.c
    trunk/client/gui-sdl2/mapview.c

Modified: trunk/client/gui-sdl/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/mapview.c?rev=29031&r1=29030&r2=29031&view=diff
==============================================================================
--- trunk/client/gui-sdl/mapview.c      (original)
+++ trunk/client/gui-sdl/mapview.c      Sun May 10 11:38:35 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: trunk/client/gui-sdl2/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/mapview.c?rev=29031&r1=29030&r2=29031&view=diff
==============================================================================
--- trunk/client/gui-sdl2/mapview.c     (original)
+++ trunk/client/gui-sdl2/mapview.c     Sun May 10 11:38:35 2015
@@ -925,7 +925,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

Reply via email to