From 2c75d95ddf849996bfc18267a9eecb4d0f4e1916 Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Wed, 16 Mar 2022 15:30:37 -0400 Subject: signs can be read now! --- src/game.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/game.h') diff --git a/src/game.h b/src/game.h index 71685e6..637a033 100644 --- a/src/game.h +++ b/src/game.h @@ -11,6 +11,9 @@ #include "animation.h" #include "interpolation.h" #include "consts.h" +#include "sign.h" + +class Renderer; constexpr int TilesetIndex(int x, int y) { return x + y * 25; @@ -23,13 +26,6 @@ enum class LoseState { Outro }; -enum class SignInstructionState { - Hidden, - FadingIn, - Visible, - FadingOut -}; - struct Input { bool left = false; bool right = false; @@ -58,7 +54,7 @@ struct Kickup { class Game { public: - Game(std::mt19937& rng, Muxer& muxer); + Game(std::mt19937& rng, Muxer& muxer, Renderer& render); void update(size_t dt); @@ -111,6 +107,7 @@ public: int nextSignIndex = 0; SignInstructionState signInstructionState = SignInstructionState::Hidden; Interpolation signFade; + Sign sign; private: @@ -144,6 +141,8 @@ private: void performDash(); + void updatePlaying(size_t frameTime); + }; #endif /* end of include guard: GAME_H_7D2B65AE */ -- cgit 1.4.1