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

Spider: Make non-movable cards disabled :^)

Browse source 
In Spider, cards that can't be moved are now shown as disabled using the
helpers in LibCards. This makes it much easier to see what can be moved
and to where, overall improving the game significantly!
This commit is contained in:
david072 2023-11-12 11:47:54 +01:00 • committed by Sam Atkins
parent 0a806837b5
commit bac7c057e9
2 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,6 +2,7 @@
* Copyright (c) 2021, Jamie Mansfield <jmansfield@cadixdev.org>
* Copyright (c) 2022, Jonas Höpner <me@jonashoepner.de>
* Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2023, David Ganz <david.g.ganz@gmail.com>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -102,6 +103,8 @@ void Game::perform_undo()
m_last_move = {};
if (on_undo_availability_change)
on_undo_availability_change(false);
update_disabled_cards();
invalidate_layout();
}
@ -181,6 +184,7 @@ void Game::detect_full_stacks()
}
}
update_disabled_cards();
detect_victory();
}
@ -333,6 +337,7 @@ void Game::mouseup_event(GUI::MouseEvent& event)
update(moving_cards_source_stack()->bounding_box());
}
update_disabled_cards();
m_mouse_down = false;
}
@ -406,12 +411,23 @@ void Game::deal_next_card()
stock_pile.push(m_new_deck.take_last()).release_value_but_fixme_should_propagate_errors();
update(stock_pile.bounding_box());
update_disabled_cards();
m_state = State::WaitingForNewGame;
stop_timer();
}
}
void Game::update_disabled_cards()
{
for (auto& stack : stacks()) {
if (stack->type() != CardStack::Type::Normal)
continue;
stack->update_disabled_cards(CardStack::MovementRule::Same);
update(stack->bounding_box());
}
}
void Game::timer_event(Core::TimerEvent&)
{
if (m_state == State::NewGameAnimation) {
@ -434,6 +450,7 @@ void Game::timer_event(Core::TimerEvent&)
++m_draw_animation_pile;
if (m_draw_animation_pile == piles.size()) {
update_disabled_cards();
update(m_original_stock_rect);
detect_full_stacks();