RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 05:37:34 +00:00
Code Issues Activity Actions

Hearts: Don't advance the game's state when an animation is playing

Browse source 
Previously we'd end up cancelling an animation that was still playing
when the user selects a card.
This commit is contained in:
Gunnar Beutner 2021-05-25 08:56:54 +02:00 • committed by Andreas Kling
parent fc99aa92bd
commit 95401d2ca2
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Games/Hearts/Game.cpp
View file

@ -269,6 +269,7 @@ void Game::timer_event(Core::TimerEvent&)
} }
if (m_animation_current_step >= m_animation_steps) { if (m_animation_current_step >= m_animation_steps) {
stop_timer(); stop_timer();
m_animation_playing = false;
if (m_animation_did_finish) if (m_animation_did_finish)
(*m_animation_did_finish)(); (*m_animation_did_finish)();
} }
@ -398,6 +399,9 @@ void Game::continue_game_after_delay(int interval_ms)
void Game::advance_game() void Game::advance_game()
{ {
if (m_animation_playing)
return;
if (m_state == State::Play && game_ended()) { if (m_state == State::Play && game_ended()) {
m_state = State::GameEnded; m_state = State::GameEnded;
on_status_change("Game ended."); on_status_change("Game ended.");