0ct0pu5/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-12-01 20:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Solitaire: Start timer when first card is moved

Browse source 
Starts the game timer when the first card is clicked or moved instead of
when a new game is started.

Fixes #7489
This commit is contained in:
Marcus Nilsson 2021-05-27 14:27:20 +02:00 committed by Andreas Kling
parent bacb2dea70
commit f7667901ed
Notes: sideshowbarker 2024-07-18 17:17:39 +09:00 
Author: https://github.com/metmo
Commit: https://github.com/SerenityOS/serenity/commit/f7667901eda
Pull-request: https://github.com/SerenityOS/serenity/pull/7502
Issue: https://github.com/SerenityOS/serenity/issues/7489
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,6 +155,11 @@ void Game::mousedown_event(GUI::MouseEvent& event)
if (m_new_game_animation || m_game_over_animation)
return;
if (on_game_start && m_waiting_for_new_game) {
on_game_start();
m_waiting_for_new_game = false;
}
auto click_location = event.position();
for (auto& to_check : m_stacks) {
if (to_check.type() == CardStack::Type::Waste)
@ -440,10 +445,8 @@ void Game::paint_event(GUI::PaintEvent& event)
while (!m_new_deck.is_empty())
stack(Stock).push(m_new_deck.take_last());
m_new_game_animation = false;
m_waiting_for_new_game = true;
stop_timer();
if (on_game_start)
on_game_start();
}
}
}

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

@ -173,7 +173,7 @@ private:
Animation m_animation;
bool m_game_over_animation { false };
bool m_waiting_for_new_game { true };
bool m_new_game_animation { false };
uint8_t m_new_game_animation_pile { 0 };
uint8_t m_new_game_animation_delay { 0 };

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

@ -146,6 +146,7 @@ int main(int argc, char** argv)
statusbar.set_text(1, String::formatted("High Score: {}", score));
}
}
statusbar.set_text(2, "Timer starts after your first move");
};
GUI::ActionGroup draw_setting_actions;