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

BrickGame: Propagate errors

Browse source
This commit is contained in:
Daniel 2023-06-20 12:05:55 -04:00 • committed by Jelle Raaijmakers
parent 83ebd1882f
commit 0eb09a0b59
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Games/BrickGame/BrickGame.cpp
View file

@ -612,7 +612,7 @@ void BrickGame::paint_paused_text(GUI::Painter& painter)
painter.draw_text(frame_inner_rect(), paused_text, Gfx::TextAlignment::Center, Color::Black);
}
void BrickGame::paint_game(GUI::Painter& painter, Gfx::IntRect const& rect)
ErrorOr<void> BrickGame::paint_game(GUI::Painter& painter, Gfx::IntRect const& rect)
{
painter.fill_rect(rect, m_back_color);
if (m_state == GameState::Active) {
@ -645,9 +645,9 @@ void BrickGame::paint_game(GUI::Painter& painter, Gfx::IntRect const& rect)
paint_cell(painter, cell_rect(position), (*m_brick_game)[board_position]);
}
paint_sidebar_text(painter, 0, String::formatted("Score: {}", m_brick_game->score()).release_value_but_fixme_should_propagate_errors());
paint_sidebar_text(painter, 1, String::formatted("Level: {}", m_brick_game->level()).release_value_but_fixme_should_propagate_errors());
paint_sidebar_text(painter, 4, String::formatted("Hi-Score: {}", m_high_score).release_value_but_fixme_should_propagate_errors());
paint_sidebar_text(painter, 0, TRY(String::formatted("Score: {}", m_brick_game->score())));
paint_sidebar_text(painter, 1, TRY(String::formatted("Level: {}", m_brick_game->level())));
paint_sidebar_text(painter, 4, TRY(String::formatted("Hi-Score: {}", m_high_score)));
paint_sidebar_text(painter, 12, "Next:"sv);
auto const hint_rect = Gfx::IntRect {
@ -669,6 +669,8 @@ void BrickGame::paint_game(GUI::Painter& painter, Gfx::IntRect const& rect)
if (m_brick_game->state() == Bricks::GameState::Paused)
paint_paused_text(painter);
}
return {};
}
void BrickGame::paint_event(GUI::PaintEvent& event)
@ -677,7 +679,7 @@ void BrickGame::paint_event(GUI::PaintEvent& event)
GUI::Painter painter(*this);
painter.add_clip_rect(frame_inner_rect());
painter.add_clip_rect(event.rect());
paint_game(painter, frame_inner_rect());
paint_game(painter, frame_inner_rect()).release_value_but_fixme_should_propagate_errors();
}
void BrickGame::game_over()

2
Userland/Games/BrickGame/BrickGame.h
View file

@ -38,7 +38,7 @@ private:
void paint_sidebar_text(GUI::Painter&, int row, StringView);
void paint_paused_text(GUI::Painter&);
void paint_cell(GUI::Painter&, Gfx::IntRect, BoardSpace);
void paint_game(GUI::Painter&, Gfx::IntRect const&);
ErrorOr<void> paint_game(GUI::Painter&, Gfx::IntRect const&);
void game_over();
enum class GameState {