Author: cazfi
Date: Tue Feb 17 19:55:57 2015
New Revision: 28195

URL: http://svn.gna.org/viewcvs/freeciv?rev=28195&view=rev
Log:
Fixed Turn Done button blinking to work correctly in turnblock mode.

See bug #23277

Modified:
    branches/S2_5/client/control.c

Modified: branches/S2_5/client/control.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/control.c?rev=28195&r1=28194&r2=28195&view=diff
==============================================================================
--- branches/S2_5/client/control.c      (original)
+++ branches/S2_5/client/control.c      Tue Feb 17 19:55:57 2015
@@ -788,9 +788,18 @@
       && !client.conn.playing->phase_done) {
     if (!blink_timer || timer_read_seconds(blink_timer) > blink_time) {
       int is_waiting = 0, is_moving = 0;
+      bool blocking_mode;
+      struct option *opt;
+
+      opt = optset_option_by_name(server_optset, "turnblock");
+      if (opt != NULL) {
+        blocking_mode = option_bool_get(opt);
+      } else {
+        blocking_mode = FALSE;
+      }
 
       players_iterate_alive(pplayer) {
-        if (pplayer->is_connected) {
+        if (pplayer->is_connected || blocking_mode) {
           if (pplayer->phase_done) {
             is_waiting++;
           } else {


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

Reply via email to