diff --git a/Userland/Games/FlappyBug/Game.cpp b/Userland/Games/FlappyBug/Game.cpp index 02344d7f85..85041743b3 100644 --- a/Userland/Games/FlappyBug/Game.cpp +++ b/Userland/Games/FlappyBug/Game.cpp @@ -8,7 +8,8 @@ namespace FlappyBug { -Game::Game() +Game::Game(Bug bug) + : m_bug(move(bug)) { set_override_cursor(Gfx::StandardCursor::Hidden); start_timer(16); diff --git a/Userland/Games/FlappyBug/Game.h b/Userland/Games/FlappyBug/Game.h index fb9d4e890c..fe06c32599 100644 --- a/Userland/Games/FlappyBug/Game.h +++ b/Userland/Games/FlappyBug/Game.h @@ -44,11 +44,26 @@ public: const float x { 50 }; const float radius { 16 }; const float starting_y { 200 }; - NonnullRefPtr falling_bitmap { Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/falling.png").release_value_but_fixme_should_propagate_errors() }; - NonnullRefPtr flapping_bitmap { Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/flapping.png").release_value_but_fixme_should_propagate_errors() }; + NonnullRefPtr falling_bitmap; + NonnullRefPtr flapping_bitmap; float y {}; float velocity {}; + private: + Bug(NonnullRefPtr falling_bitmap_value, NonnullRefPtr flapping_bitmap_value) + : falling_bitmap(move(falling_bitmap_value)) + , flapping_bitmap(move(flapping_bitmap_value)) + { + } + + public: + static ErrorOr construct() + { + NonnullRefPtr falling_bitmap = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/falling.png")); + NonnullRefPtr flapping_bitmap = TRY(Gfx::Bitmap::try_load_from_file("/res/icons/flappybug/flapping.png")); + return Bug(move(falling_bitmap), move(flapping_bitmap)); + } + void reset() { y = starting_y; @@ -153,7 +168,7 @@ private: 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 }; - Game(); + Game(Bug); }; } diff --git a/Userland/Games/FlappyBug/main.cpp b/Userland/Games/FlappyBug/main.cpp index 008a9f4fbc..eab09f91e3 100644 --- a/Userland/Games/FlappyBug/main.cpp +++ b/Userland/Games/FlappyBug/main.cpp @@ -37,7 +37,7 @@ ErrorOr serenity_main(Main::Arguments arguments) window->set_title("Flappy Bug"); window->set_double_buffering_enabled(false); window->set_resizable(false); - auto widget = TRY(window->try_set_main_widget()); + auto widget = TRY(window->try_set_main_widget(TRY(FlappyBug::Game::Bug::construct()))); widget->on_game_end = [&](u32 score) { if (score <= high_score)