diff options
author | Aki <please@ignore.pl> | 2022-04-18 11:35:25 +0200 |
---|---|---|
committer | Aki <please@ignore.pl> | 2022-04-18 11:35:25 +0200 |
commit | 7c9c492f1555bb84a43fc68a56f69c25b54e7346 (patch) | |
tree | f7594050ed5f0f3a8f4100b9cae081ff3a73a995 /GameScreen.cpp | |
parent | 9026eea38124b73b17f19b137dbc71eab4a7a2e9 (diff) | |
download | bullethell2022-7c9c492f1555bb84a43fc68a56f69c25b54e7346.zip bullethell2022-7c9c492f1555bb84a43fc68a56f69c25b54e7346.tar.gz bullethell2022-7c9c492f1555bb84a43fc68a56f69c25b54e7346.tar.bz2 |
Separated Stage from GameScreen
Diffstat (limited to 'GameScreen.cpp')
-rw-r--r-- | GameScreen.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/GameScreen.cpp b/GameScreen.cpp index 4315060..02aab00 100644 --- a/GameScreen.cpp +++ b/GameScreen.cpp @@ -1,11 +1,15 @@ #include "GameScreen.h" +#include <memory> +#include <utility> + #include <raylib.h> +#include "Stage.h" + -GameScreen::GameScreen() : - m_const {}, - m_generator {m_const.m_bullets} +GameScreen::GameScreen(std::unique_ptr<Stage> stage) : + m_stage {std::move(stage)} { } @@ -13,19 +17,17 @@ GameScreen::GameScreen() : void GameScreen::update(const float dt) { - m_player.update(dt); - m_generator.update(dt); - m_const.update(dt); - bool collided = m_player.collide(m_const.m_bullets); - (void) collided; + if (m_stage) + m_stage->update(dt); } void GameScreen::draw() { - m_const.draw(); - m_player.draw(); + if (m_stage) { + m_stage->draw(); + DrawText(TextFormat("%d", m_stage->total_bullets()), 5, 25, 20, DARKGRAY); + } DrawFPS(5, 5); - DrawText(TextFormat("%d", m_const.m_bullets.size()), 5, 25, 20, DARKGRAY); } |