MasscollabsGamingStudios/gnome-chess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix game ending with 1s left on timer

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=721722
This commit is contained in:
Michael Catanzaro 2014-09-15 18:13:02 -05:00
parent c65d9521c5
commit 072e12f299
1 changed files with 12 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
lib/chess-clock.vala
View file

@ -36,28 +36,26 @@ public class ChessClock : Object
}
private Timer? timer;
private uint expire_timeout_id = 0;
private uint tick_timeout_id = 0;
public signal void tick ();
public signal void expired ();
private bool is_active = false;
public ChessClock (int white_initial_seconds, int black_initial_seconds)
{
this.white_initial_seconds = white_initial_seconds;
this.black_initial_seconds = black_initial_seconds;
}
private bool is_active
{
get { return timer != null && expire_timeout_id != 0; }
}
public void start ()
{
if (is_active)
return;
is_active = true;
if (timer == null)
{
/* Starts automatically */
@ -71,13 +69,6 @@ public class ChessClock : Object
watch_timer ();
}
private bool timer_expired_cb ()
{
stop ();
expired ();
return false;
}
private bool tick_cb ()
{
if (active_color == Color.WHITE)
@ -87,6 +78,13 @@ public class ChessClock : Object
tick ();
if (white_seconds_used >= white_initial_seconds ||
black_seconds_used >= black_initial_seconds)
{
stop ();
expired ();
}
return true;
}
@ -97,6 +95,7 @@ public class ChessClock : Object
timer.stop ();
stop_watching_timer ();
is_active = false;
}
public void pause ()
@ -119,22 +118,12 @@ public class ChessClock : Object
private void watch_timer ()
{
/* Notify when this timer has expired */
if (active_color == Color.WHITE)
expire_timeout_id = Timeout.add_seconds (white_initial_seconds - white_seconds_used,
timer_expired_cb);
else
expire_timeout_id = Timeout.add_seconds (black_initial_seconds - black_seconds_used,
timer_expired_cb);
/* Wake up each second */
tick_timeout_id = Timeout.add_seconds (1, tick_cb);
}
private void stop_watching_timer ()
{
Source.remove (expire_timeout_id);
expire_timeout_id = 0;
Source.remove (tick_timeout_id);
tick_timeout_id = 0;
}