RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 14:57:35 +00:00
Code Issues Activity Actions

Solitaire: Only start timer when a move happens

Browse source 
Previously, the timer started if you clicked within the game area,
whether that was on a card or not. Now, we only start when you click
on a card or otherwise attempt a move.

As a bonus, we now immediately update the status bar time indicator
on game start, instead of having to wait until 1 second has elapsed.
This commit is contained in:
Sam Atkins 2021-06-12 19:45:47 +01:00 • committed by Linus Groh
parent 8ee447b718
commit 679f831451
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -201,8 +201,6 @@ void Game::mousedown_event(GUI::MouseEvent& event)
if (m_new_game_animation || m_game_over_animation) if (m_new_game_animation || m_game_over_animation)
return; return;
start_timer_if_necessary();
auto click_location = event.position(); auto click_location = event.position();
for (auto& to_check : m_stacks) { for (auto& to_check : m_stacks) {
if (to_check.type() == CardStack::Type::Waste) if (to_check.type() == CardStack::Type::Waste)
@ -218,6 +216,7 @@ void Game::mousedown_event(GUI::MouseEvent& event)
if (top_card.rect().contains(click_location)) { if (top_card.rect().contains(click_location)) {
top_card.set_upside_down(false); top_card.set_upside_down(false);
score_flip(); score_flip();
start_timer_if_necessary();
update(top_card.rect()); update(top_card.rect());
remember_flip_for_undo(top_card); remember_flip_for_undo(top_card);
} }
@ -227,6 +226,7 @@ void Game::mousedown_event(GUI::MouseEvent& event)
to_check.set_focused(true); to_check.set_focused(true);
m_focused_stack = &to_check; m_focused_stack = &to_check;
m_mouse_down = true; m_mouse_down = true;
start_timer_if_necessary();
} }
} }
break; break;
@ -410,6 +410,8 @@ void Game::draw_cards()
else else
update(play_bounding_box); update(play_bounding_box);
} }
start_timer_if_necessary();
} }
void Game::pop_waste_to_play_stack() void Game::pop_waste_to_play_stack()
@ -462,6 +464,7 @@ bool Game::attempt_to_move_card_to_foundations(CardStack& from)
if (from.type() == CardStack::Type::Play) if (from.type() == CardStack::Type::Play)
pop_waste_to_play_stack(); pop_waste_to_play_stack();
start_timer_if_necessary();
check_for_game_over(); check_for_game_over();
} }
@ -481,10 +484,8 @@ void Game::auto_move_eligible_cards_to_foundations()
} }
// If at least one card was moved, check again to see if now any additional cards can now be moved // If at least one card was moved, check again to see if now any additional cards can now be moved
if (card_was_moved) { if (card_was_moved)
start_timer_if_necessary();
auto_move_eligible_cards_to_foundations(); auto_move_eligible_cards_to_foundations();
}
} }
void Game::mark_intersecting_stacks_dirty(Card& intersecting_card) void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)

1
Userland/Games/Solitaire/main.cpp
View file

@ -129,6 +129,7 @@ int main(int argc, char** argv)
game.on_game_start = [&]() { game.on_game_start = [&]() {
seconds_elapsed = 0; seconds_elapsed = 0;
timer->start(); timer->start();
statusbar.set_text(2, "Time: 00:00:00");
}; };
game.on_game_end = [&](Solitaire::GameOverReason reason, uint32_t score) { game.on_game_end = [&](Solitaire::GameOverReason reason, uint32_t score) {
if (timer->is_active()) if (timer->is_active())