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

Solitaire: Allow automatic moves to end the game and animate

Browse source 
Previously, if a tab-move moved all the remaining cards to the
foundations, the game would not notice until you moved a card
away and then back again.

I had to add a 1-frame delay to starting the animation, so that it
would have time to re-paint the foundation in that case.
This commit is contained in:
Sam Atkins 2021-06-12 17:47:11 +01:00 • committed by Linus Groh
parent 5eef07d232
commit cf504ccc6a
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Userland/Games/Solitaire/Game.cpp
View file

@ -49,7 +49,10 @@ static float rand_float()
void Game::timer_event(Core::TimerEvent&) void Game::timer_event(Core::TimerEvent&)
{ {
if (m_game_over_animation) { if (m_start_game_over_animation_next_frame) {
m_start_game_over_animation_next_frame = false;
m_game_over_animation = true;
} else if (m_game_over_animation) {
VERIFY(!m_animation.card().is_null()); VERIFY(!m_animation.card().is_null());
if (m_animation.card()->position().x() >= Game::width || m_animation.card()->rect().right() <= 0) if (m_animation.card()->position().x() >= Game::width || m_animation.card()->rect().right() <= 0)
create_new_animation_card(); create_new_animation_card();
@ -76,7 +79,11 @@ void Game::start_game_over_animation()
return; return;
create_new_animation_card(); create_new_animation_card();
m_game_over_animation = true;
// We wait one frame, to make sure that the foundation stacks are repainted before we start.
// Otherwise, if the game ended from an attempt_to_move_card_to_foundations() move, the
// foundations could appear empty or otherwise incorrect.
m_start_game_over_animation_next_frame = true;
start_timer(s_timer_interval_ms); start_timer(s_timer_interval_ms);
@ -322,10 +329,10 @@ void Game::doubleclick_event(GUI::MouseEvent& event)
void Game::check_for_game_over() void Game::check_for_game_over()
{ {
for (auto& stack : m_stacks) { for (auto foundationID : foundations) {
if (stack.type() != CardStack::Type::Foundation) auto& foundation = stack(foundationID);
continue;
if (stack.count() != Card::card_count) if (foundation.count() != Card::card_count)
return; return;
} }
@ -447,9 +454,13 @@ bool Game::attempt_to_move_card_to_foundations(CardStack& from)
} }
} }
if (card_was_moved && (from.type() == CardStack::Type::Play)) if (card_was_moved) {
if (from.type() == CardStack::Type::Play)
pop_waste_to_play_stack(); pop_waste_to_play_stack();
check_for_game_over();
}
return card_was_moved; return card_was_moved;
} }

1
Userland/Games/Solitaire/Game.h
View file

@ -198,6 +198,7 @@ private:
bool m_mouse_down { false }; bool m_mouse_down { false };
Animation m_animation; Animation m_animation;
bool m_start_game_over_animation_next_frame { false };
bool m_game_over_animation { false }; bool m_game_over_animation { false };
bool m_waiting_for_new_game { true }; bool m_waiting_for_new_game { true };
bool m_new_game_animation { false }; bool m_new_game_animation { false };