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

LibCards+Games: Replace card "value" int with a Rank enum

Browse source 
Because `card->value() == 11` is a lot less clear than `card->rank() ==
Cards::Rank::Queen`, and also safer.

Put this, along with the `Suit` enum, in the `Cards` namespace directly
instead of inside `Cards::Card`. Slightly less typing that way.
This commit is contained in:
Sam Atkins 2022-08-20 20:21:33 +01:00 • committed by Andreas Kling
parent 163a74e3e2
commit aac2488d5c
9 changed files with 121 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibCards/CardStack.cpp
View file

@ -170,12 +170,12 @@ void CardStack::add_all_grabbed_cards(Gfx::IntPoint const& click_location, Nonnu
break;
}
if (!color_match || card.value() != last_value - 1) {
if (!color_match || to_underlying(card.rank()) != last_value - 1) {
valid_stack = false;
break;
}
}
last_value = card.value();
last_value = to_underlying(card.rank());
last_color = card.color();
}
@ -195,13 +195,13 @@ bool CardStack::is_allowed_to_push(Card const& card, size_t stack_size, Movement
if (m_type == Type::Normal && is_empty()) {
// FIXME: proper solution for this
if (movement_rule == MovementRule::Alternating) {
return card.value() == 12;
return card.rank() == Rank::King;
}
return true;
}
if (m_type == Type::Foundation && is_empty())
return card.value() == 0;
return card.rank() == Rank::Ace;
if (!is_empty()) {
auto& top_card = peek();
@ -212,7 +212,7 @@ bool CardStack::is_allowed_to_push(Card const& card, size_t stack_size, Movement
// Prevent player from dragging an entire stack of cards to the foundation stack
if (stack_size > 1)
return false;
return top_card.suit() == card.suit() && m_stack.size() == card.value();
return top_card.suit() == card.suit() && m_stack.size() == to_underlying(card.rank());
} else if (m_type == Type::Normal) {
bool color_match;
switch (movement_rule) {
@ -227,7 +227,7 @@ bool CardStack::is_allowed_to_push(Card const& card, size_t stack_size, Movement
break;
}
return color_match && top_card.value() == card.value() + 1;
return color_match && to_underlying(top_card.rank()) == to_underlying(card.rank()) + 1;
}
VERIFY_NOT_REACHED();