LibCards+Games: Move mark_intersecting_stacks_dirty() to CardGame

As part of this, made a const overload for `Card::rect()`. We need the
non-const one too as it's used for modifying the position of a card
that's being dragged. I plan on changing that soon but we'll see.
This commit is contained in:
Sam Atkins 2022-09-28 14:18:44 +01:00 committed by Sam Atkins
parent 12612703f9
commit 5960c0556f
Notes: sideshowbarker 2024-07-17 06:05:54 +09:00
7 changed files with 12 additions and 22 deletions
Userland
Games
Libraries/LibCards

View file

@ -521,16 +521,6 @@ void Game::auto_move_eligible_cards_to_foundations()
auto_move_eligible_cards_to_foundations();
}
void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)
{
for (auto& stack : stacks()) {
if (intersecting_card.rect().intersects(stack.bounding_box()))
update(stack.bounding_box());
}
update(intersecting_card.rect());
}
void Game::paint_event(GUI::PaintEvent& event)
{
Gfx::Color background_color = this->background_color();

View file

@ -159,7 +159,6 @@ private:
}
}
void mark_intersecting_stacks_dirty(Card& intersecting_card);
void score_move(CardStack& from, CardStack& to, bool inverse = false);
void score_flip(bool inverse = false);
void remember_move_for_undo(CardStack& from, CardStack& to, NonnullRefPtrVector<Card> moved_cards);

View file

@ -105,16 +105,6 @@ void Game::draw_cards()
start_timer(s_timer_interval_ms);
}
void Game::mark_intersecting_stacks_dirty(Card& intersecting_card)
{
for (auto& stack : stacks()) {
if (intersecting_card.rect().intersects(stack.bounding_box()))
update(stack.bounding_box());
}
update(intersecting_card.rect());
}
void Game::detect_full_stacks()
{
auto& completed_stack = stack_at_location(Completed);

View file

@ -70,7 +70,6 @@ private:
void start_timer_if_necessary();
void update_score(int delta);
void draw_cards();
void mark_intersecting_stacks_dirty(Card& intersecting_card);
void detect_full_stacks();
void detect_victory();
void move_focused_cards(CardStack& stack);

View file

@ -88,6 +88,7 @@ public:
virtual ~Card() override = default;
Gfx::IntRect& rect() { return m_rect; }
Gfx::IntRect const& rect() const { return m_rect; }
Gfx::IntPoint position() const { return m_rect.location(); }
Gfx::IntPoint const& old_position() const { return m_old_position; }
Rank rank() const { return m_rank; };

View file

@ -22,6 +22,16 @@ void CardGame::add_stack(NonnullRefPtr<CardStack> stack)
m_stacks.append(move(stack));
}
void CardGame::mark_intersecting_stacks_dirty(Cards::Card const& intersecting_card)
{
for (auto& stack : stacks()) {
if (intersecting_card.rect().intersects(stack.bounding_box()))
update(stack.bounding_box());
}
update(intersecting_card.rect());
}
void CardGame::dump_layout() const
{
dbgln("------------------------------");

View file

@ -25,6 +25,7 @@ public:
NonnullRefPtrVector<CardStack> const& stacks() const { return m_stacks; }
CardStack& stack_at_location(int location) { return m_stacks[location]; }
void add_stack(NonnullRefPtr<CardStack>);
void mark_intersecting_stacks_dirty(Card const& intersecting_card);
void dump_layout() const;