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

FlappyBug: Propagate errors in Cloud class

Browse source 
Move-construct Cloud into the Game class to improve
error handling.
This commit is contained in:
creator1creeper1 2021-12-23 22:29:00 +01:00 • committed by Brian Gianforcaro
parent ff359c27e3
commit 6f592a32cc
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Userland/Games/FlappyBug/Game.cpp
View file

@ -8,8 +8,9 @@
namespace FlappyBug { namespace FlappyBug {
Game::Game(Bug bug) Game::Game(Bug bug, Cloud cloud)
: m_bug(move(bug)) : m_bug(move(bug))
, m_cloud(move(cloud))
{ {
set_override_cursor(Gfx::StandardCursor::Hidden); set_override_cursor(Gfx::StandardCursor::Hidden);
start_timer(16); start_timer(16);

23
Userland/Games/FlappyBug/Game.h
View file

@ -122,21 +122,30 @@ public:
}; };
struct Cloud { struct Cloud {
Vector<NonnullRefPtr<Gfx::Bitmap>> const cloud_bitmaps { Vector<NonnullRefPtr<Gfx::Bitmap>> const cloud_bitmaps;
Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/cloud_0.png").release_value_but_fixme_should_propagate_errors(),
Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/cloud_1.png").release_value_but_fixme_should_propagate_errors(),
Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/cloud_2.png").release_value_but_fixme_should_propagate_errors(),
};
float x {}; float x {};
float y {}; float y {};
int bitmap_id {}; int bitmap_id {};
Cloud() private:
Cloud(Vector<NonnullRefPtr<Gfx::Bitmap>> const cloud_bitmaps_value)
: cloud_bitmaps(move(cloud_bitmaps_value))
{ {
reset(); reset();
x = get_random_uniform(game_width); x = get_random_uniform(game_width);
} }
public:
static ErrorOr<Cloud> construct()
{
Vector<NonnullRefPtr<Gfx::Bitmap>> const cloud_bitmaps {
TRY(Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/cloud_0.png")),
TRY(Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/cloud_1.png")),
TRY(Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/cloud_2.png")),
};
return Cloud(move(cloud_bitmaps));
}
void reset() void reset()
{ {
bitmap_id = get_random_uniform(cloud_bitmaps.size()); bitmap_id = get_random_uniform(cloud_bitmaps.size());
@ -168,7 +177,7 @@ private:
const Gfx::IntRect m_score_rect { 10, 10, 20, 20 }; const Gfx::IntRect m_score_rect { 10, 10, 20, 20 };
const Gfx::IntRect m_text_rect { game_width / 2 - 80, game_height / 2 - 40, 160, 80 }; const Gfx::IntRect m_text_rect { game_width / 2 - 80, game_height / 2 - 40, 160, 80 };
Game(Bug); Game(Bug, Cloud);
}; };
} }

2
Userland/Games/FlappyBug/main.cpp
View file

@ -37,7 +37,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_title("Flappy Bug"); window->set_title("Flappy Bug");
window->set_double_buffering_enabled(false); window->set_double_buffering_enabled(false);
window->set_resizable(false); window->set_resizable(false);
auto widget = TRY(window->try_set_main_widget<FlappyBug::Game>(TRY(FlappyBug::Game::Bug::construct()))); auto widget = TRY(window->try_set_main_widget<FlappyBug::Game>(TRY(FlappyBug::Game::Bug::construct()), TRY(FlappyBug::Game::Cloud::construct())));
widget->on_game_end = [&](u32 score) { widget->on_game_end = [&](u32 score) {
if (score <= high_score) if (score <= high_score)