RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-15 18:32:07 +00:00
Code Issues Activity Actions

LibCards+Games: Make CardGame::add_stack() fallible

Browse source 
And while we're at it, handle the CardStack allocation (and failure
thereof) internally.
This commit is contained in:
Sam Atkins 2023-01-05 17:24:27 +00:00 • committed by Linus Groh
parent 08ff87b3ce
commit d7ba577c90
4 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Userland/Games/Solitaire/Game.cpp
View file

@ -21,20 +21,20 @@ static constexpr int s_timer_interval_ms = 1000 / 60;
Game::Game() Game::Game()
{ {
add_stack(adopt_ref(*new CardStack({ 10, 10 }, CardStack::Type::Stock))); MUST(add_stack(Gfx::IntPoint { 10, 10 }, CardStack::Type::Stock));
add_stack(adopt_ref(*new CardStack({ 10 + Card::width + 10, 10 }, CardStack::Type::Waste))); MUST(add_stack(Gfx::IntPoint { 10 + Card::width + 10, 10 }, CardStack::Type::Waste));
add_stack(adopt_ref(*new CardStack({ 10 + Card::width + 10, 10 }, CardStack::Type::Play, stack_at_location(Waste)))); MUST(add_stack(Gfx::IntPoint { 10 + Card::width + 10, 10 }, CardStack::Type::Play, stack_at_location(Waste)));
add_stack(adopt_ref(*new CardStack({ Game::width - 4 * Card::width - 40, 10 }, CardStack::Type::Foundation))); MUST(add_stack(Gfx::IntPoint { Game::width - 4 * Card::width - 40, 10 }, CardStack::Type::Foundation));
add_stack(adopt_ref(*new CardStack({ Game::width - 3 * Card::width - 30, 10 }, CardStack::Type::Foundation))); MUST(add_stack(Gfx::IntPoint { Game::width - 3 * Card::width - 30, 10 }, CardStack::Type::Foundation));
add_stack(adopt_ref(*new CardStack({ Game::width - 2 * Card::width - 20, 10 }, CardStack::Type::Foundation))); MUST(add_stack(Gfx::IntPoint { Game::width - 2 * Card::width - 20, 10 }, CardStack::Type::Foundation));
add_stack(adopt_ref(*new CardStack({ Game::width - Card::width - 10, 10 }, CardStack::Type::Foundation))); MUST(add_stack(Gfx::IntPoint { Game::width - Card::width - 10, 10 }, CardStack::Type::Foundation));
add_stack(adopt_ref(*new CardStack({ 10, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10, 10 + Card::height + 10 }, CardStack::Type::Normal));
add_stack(adopt_ref(*new CardStack({ 10 + Card::width + 10, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + Card::width + 10, 10 + Card::height + 10 }, CardStack::Type::Normal));
add_stack(adopt_ref(*new CardStack({ 10 + 2 * Card::width + 20, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + 2 * Card::width + 20, 10 + Card::height + 10 }, CardStack::Type::Normal));
add_stack(adopt_ref(*new CardStack({ 10 + 3 * Card::width + 30, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + 3 * Card::width + 30, 10 + Card::height + 10 }, CardStack::Type::Normal));
add_stack(adopt_ref(*new CardStack({ 10 + 4 * Card::width + 40, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + 4 * Card::width + 40, 10 + Card::height + 10 }, CardStack::Type::Normal));
add_stack(adopt_ref(*new CardStack({ 10 + 5 * Card::width + 50, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + 5 * Card::width + 50, 10 + Card::height + 10 }, CardStack::Type::Normal));
add_stack(adopt_ref(*new CardStack({ 10 + 6 * Card::width + 60, 10 + Card::height + 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + 6 * Card::width + 60, 10 + Card::height + 10 }, CardStack::Type::Normal));
} }
static float rand_float() static float rand_float()

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

@ -22,11 +22,11 @@ static constexpr int s_timer_interval_ms = 1000 / 60;
Game::Game() Game::Game()
{ {
add_stack(adopt_ref(*new CardStack({ 10, Game::height - Card::height - 10 }, CardStack::Type::Waste))); MUST(add_stack(Gfx::IntPoint { 10, Game::height - Card::height - 10 }, CardStack::Type::Waste));
add_stack(adopt_ref(*new CardStack({ Game::width - Card::width - 10, Game::height - Card::height - 10 }, CardStack::Type::Stock))); MUST(add_stack(Gfx::IntPoint { Game::width - Card::width - 10, Game::height - Card::height - 10 }, CardStack::Type::Stock));
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
add_stack(adopt_ref(*new CardStack({ 10 + i * (Card::width + 10), 10 }, CardStack::Type::Normal))); MUST(add_stack(Gfx::IntPoint { 10 + i * (Card::width + 10), 10 }, CardStack::Type::Normal));
} }
} }

5
Userland/Libraries/LibCards/CardGame.cpp
View file

@ -33,11 +33,6 @@ CardGame::CardGame()
set_background_color(background_color.value_or(Color::from_rgb(0x008000))); set_background_color(background_color.value_or(Color::from_rgb(0x008000)));
} }
void CardGame::add_stack(NonnullRefPtr<CardStack> stack)
{
m_stacks.append(move(stack));
}
void CardGame::mark_intersecting_stacks_dirty(Cards::Card const& intersecting_card) void CardGame::mark_intersecting_stacks_dirty(Cards::Card const& intersecting_card)
{ {
for (auto& stack : stacks()) { for (auto& stack : stacks()) {

8
Userland/Libraries/LibCards/CardGame.h
View file

@ -28,7 +28,13 @@ public:
NonnullRefPtrVector<CardStack>& stacks() { return m_stacks; } NonnullRefPtrVector<CardStack>& stacks() { return m_stacks; }
NonnullRefPtrVector<CardStack> const& stacks() const { return m_stacks; } NonnullRefPtrVector<CardStack> const& stacks() const { return m_stacks; }
CardStack& stack_at_location(int location) { return m_stacks[location]; } CardStack& stack_at_location(int location) { return m_stacks[location]; }
void add_stack(NonnullRefPtr<CardStack>);
template<class... Args>
ErrorOr<void> add_stack(Args&&... args)
{
auto stack = TRY(try_make_ref_counted<CardStack>(forward<Args>(args)...));
return m_stacks.try_append(move(stack));
}
void mark_intersecting_stacks_dirty(Card const& intersecting_card); void mark_intersecting_stacks_dirty(Card const& intersecting_card);
bool is_moving_cards() const { return !m_moving_cards.is_empty(); } bool is_moving_cards() const { return !m_moving_cards.is_empty(); }