[Freeciv-commits] r29655 - in /branches/S2_6/client: gui-sdl/mapctrl.c gui-sdl/mapview.c gui-sdl2/mapctrl.c gui-sdl2/mapview.c

[cazfi74]

Author: cazfi
Date: Sun Aug 23 15:51:26 2015
New Revision: 29655

URL: http://svn.gna.org/viewcvs/freeciv?rev=29655&view=rev
Log:
Sdl-clients no longer ask user to end turn when one already has done that.

See patch #6271

Modified:
    branches/S2_6/client/gui-sdl/mapctrl.c
    branches/S2_6/client/gui-sdl/mapview.c
    branches/S2_6/client/gui-sdl2/mapctrl.c
    branches/S2_6/client/gui-sdl2/mapview.c

Modified: branches/S2_6/client/gui-sdl/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapctrl.c?rev=29655&r1=29654&r2=29655&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/mapctrl.c      (original)
+++ branches/S2_6/client/gui-sdl/mapctrl.c      Sun Aug 23 15:51:26 2015
@@ -2728,6 +2728,7 @@
     }
     widget_redraw(pNew_Turn_Button);
     widget_flush(pNew_Turn_Button);
+    redraw_unit_info_label(get_units_in_focus());
   }
 }
 

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=29655&r1=29654&r2=29655&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/mapview.c      (original)
+++ branches/S2_6/client/gui-sdl/mapview.c      Sun Aug 23 15:51:26 2015
@@ -909,7 +909,7 @@
        hide_scrollbar(pInfo_Window->private_data.adv_dlg->pScroll);
       }
 
-      if (!client_is_observer()
+      if (!client_is_observer() && !client.conn.playing->phase_done
           && (!client.conn.playing->ai_controlled || 
options.ai_manual_turn_done)) {
         char buf[256];
         fc_snprintf(buf, sizeof(buf), "%s\n%s\n%s",

Modified: branches/S2_6/client/gui-sdl2/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapctrl.c?rev=29655&r1=29654&r2=29655&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/mapctrl.c     (original)
+++ branches/S2_6/client/gui-sdl2/mapctrl.c     Sun Aug 23 15:51:26 2015
@@ -2905,6 +2905,7 @@
     }
     widget_redraw(pNew_Turn_Button);
     widget_flush(pNew_Turn_Button);
+    redraw_unit_info_label(get_units_in_focus());
   }
 }
 

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=29655&r1=29654&r2=29655&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/mapview.c     (original)
+++ branches/S2_6/client/gui-sdl2/mapview.c     Sun Aug 23 15:51:26 2015
@@ -922,7 +922,7 @@
        hide_scrollbar(pInfo_Window->private_data.adv_dlg->pScroll);
       }
 
-      if (!client_is_observer()
+      if (!client_is_observer() && !client.conn.playing->phase_done
           && (!client.conn.playing->ai_controlled || 
options.ai_manual_turn_done)) {
         char buf[256];
 


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