Author: cazfi
Date: Thu Aug 6 17:34:09 2015
New Revision: 29360
URL: http://svn.gna.org/viewcvs/freeciv?rev=29360&view=rev
Log:
When deciding whether to blink Turn Done button as an indication that others
have already finished
their move, count only those players whose phase is going.
See bug #23733
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=29360&r1=29359&r2=29360&view=diff
==============================================================================
--- branches/S2_5/client/control.c (original)
+++ branches/S2_5/client/control.c Thu Aug 6 17:34:09 2015
@@ -785,7 +785,8 @@
if (NULL != client.conn.playing
&& client.conn.playing->is_alive
- && !client.conn.playing->phase_done) {
+ && !client.conn.playing->phase_done
+ && is_player_phase(client.conn.playing, game.info.phase)) {
if (!blink_timer || timer_read_seconds(blink_timer) > blink_time) {
int is_waiting = 0, is_moving = 0;
bool blocking_mode;
@@ -799,7 +800,8 @@
}
players_iterate_alive(pplayer) {
- if (pplayer->is_connected || blocking_mode) {
+ if ((pplayer->is_connected || blocking_mode)
+ && is_player_phase(pplayer, game.info.phase)) {
if (pplayer->phase_done) {
is_waiting++;
} else {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
