From 2af94bbf48b4404c1aefcf1cced6d6810996d05c Mon Sep 17 00:00:00 2001 From: Till Mayer Date: Tue, 10 Mar 2020 15:05:25 +0100 Subject: [PATCH] Solitaire: Remove redundant check and fix formatting mistakes --- Games/Solitaire/SolitaireWidget.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Games/Solitaire/SolitaireWidget.cpp b/Games/Solitaire/SolitaireWidget.cpp index 0d690b5c6d..7c01bb7ad9 100644 --- a/Games/Solitaire/SolitaireWidget.cpp +++ b/Games/Solitaire/SolitaireWidget.cpp @@ -183,7 +183,6 @@ void SolitaireWidget::mousedown_event(GUI::MouseEvent& event) for (auto& to_check : m_stacks) { if (to_check.bounding_box().contains(click_location)) { if (to_check.type() == CardStack::Type::Stock) { - auto& waste = stack(Waste); auto& stock = stack(Stock); @@ -200,8 +199,9 @@ void SolitaireWidget::mousedown_event(GUI::MouseEvent& event) waste.set_dirty(); m_has_to_repaint = true; update_score(-100); - } else + } else { move_card(stock, waste); + } } else if (!to_check.is_empty()) { auto& top_card = to_check.peek(); @@ -238,8 +238,7 @@ void SolitaireWidget::mouseup_event(GUI::MouseEvent& event) continue; for (auto& focused_card : m_focused_cards) { - if (stack.bounding_box().intersects(focused_card.rect()) - || stack.bounding_box().contains(event.position())) { + if (stack.bounding_box().intersects(focused_card.rect())) { if (stack.is_allowed_to_push(m_focused_cards.at(0))) { for (auto& to_intersect : m_focused_cards) { mark_intersecting_stacks_dirty(to_intersect);