mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

Spider: Use a single State enum instead of a series of booleans

Browse source
This commit is contained in:
Sam Atkins 2023-01-28 17:43:59 +00:00 • committed by Linus Groh
parent 5de8b38783
commit 8744e8b561
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@ Game::Game() = default;
void Game::setup(Mode mode)
{
if (m_new_game_animation)
if (m_state == State::NewGameAnimation)
stop_timer();
m_mode = mode;
@ -78,7 +78,7 @@ void Game::setup(Mode mode)
clear_moving_cards();
m_new_game_animation = true;
m_state = State::NewGameAnimation;
start_timer(s_timer_interval_ms);
update();
}
@ -107,9 +107,9 @@ void Game::perform_undo()
void Game::start_timer_if_necessary()
{
if (on_game_start && m_waiting_for_new_game) {
if (on_game_start && m_state == State::WaitingForNewGame) {
on_game_start();
m_waiting_for_new_game = false;
m_state = State::GameInProgress;
}
}
@ -130,7 +130,7 @@ void Game::draw_cards()
update_score(-1);
m_draw_animation = true;
m_state = State::DrawAnimation;
m_original_stock_rect = stock_pile.bounding_box();
start_timer(s_timer_interval_ms);
}
@ -250,7 +250,7 @@ void Game::mousedown_event(GUI::MouseEvent& event)
{
GUI::Frame::mousedown_event(event);
if (m_new_game_animation || m_draw_animation)
if (m_state == State::NewGameAnimation || m_state == State::DrawAnimation)
return;
auto click_location = event.position();
@ -301,7 +301,7 @@ void Game::mouseup_event(GUI::MouseEvent& event)
GUI::Frame::mouseup_event(event);
clear_hovered_stack();
if (!is_moving_cards() || m_new_game_animation || m_draw_animation)
if (!is_moving_cards() || m_state == State::NewGameAnimation || m_state == State::DrawAnimation)
return;
bool rebound = true;
@ -340,7 +340,7 @@ void Game::mousemove_event(GUI::MouseEvent& event)
{
GUI::Frame::mousemove_event(event);
if (!m_mouse_down || m_new_game_animation || m_draw_animation)
if (!m_mouse_down || m_state == State::NewGameAnimation || m_state == State::DrawAnimation)
return;
auto click_location = event.position();
@ -370,7 +370,7 @@ void Game::mousemove_event(GUI::MouseEvent& event)
void Game::timer_event(Core::TimerEvent&)
{
if (m_new_game_animation) {
if (m_state == State::NewGameAnimation) {
if (m_new_game_animation_delay < new_game_animation_delay) {
++m_new_game_animation_delay;
} else {
@ -401,12 +401,11 @@ void Game::timer_event(Core::TimerEvent&)
update(stock_pile.bounding_box());
m_new_game_animation = false;
m_waiting_for_new_game = true;
m_state = State::WaitingForNewGame;
stop_timer();
}
}
} else if (m_draw_animation) {
} else if (m_state == State::DrawAnimation) {
if (m_draw_animation_delay < draw_animation_delay) {
++m_draw_animation_delay;
} else {
@ -422,7 +421,7 @@ void Game::timer_event(Core::TimerEvent&)
update(m_original_stock_rect);
detect_full_stacks();
m_draw_animation = false;
m_state = State::GameInProgress;
m_draw_animation_delay = 0;
m_draw_animation_pile = 0;
stop_timer();

11
Userland/Games/Spider/Game.h
View file

@ -107,12 +107,17 @@ private:
bool m_mouse_down { false };
bool m_waiting_for_new_game { true };
bool m_new_game_animation { false };
enum class State {
WaitingForNewGame,
NewGameAnimation,
GameInProgress,
DrawAnimation,
Victory,
};
State m_state { State::WaitingForNewGame };
uint8_t m_new_game_animation_delay { 0 };
uint8_t m_new_game_animation_pile { 0 };
bool m_draw_animation { false };
uint8_t m_draw_animation_delay { 0 };
uint8_t m_draw_animation_pile { 0 };
Gfx::IntRect m_original_stock_rect;