diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-03-16 15:30:37 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-03-16 15:30:37 -0400 |
commit | 2c75d95ddf849996bfc18267a9eecb4d0f4e1916 (patch) | |
tree | 285315deeaf4b5153b5f92f0c8a23af557626204 /src/game.h | |
parent | 8713d03831226dcd559c6a1e2b1c7b0d7c660bac (diff) | |
download | ether-2c75d95ddf849996bfc18267a9eecb4d0f4e1916.tar.gz ether-2c75d95ddf849996bfc18267a9eecb4d0f4e1916.tar.bz2 ether-2c75d95ddf849996bfc18267a9eecb4d0f4e1916.zip |
signs can be read now!
Diffstat (limited to 'src/game.h')
-rw-r--r-- | src/game.h | 15 |
1 files changed, 7 insertions, 8 deletions
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 @@ | |||
11 | #include "animation.h" | 11 | #include "animation.h" |
12 | #include "interpolation.h" | 12 | #include "interpolation.h" |
13 | #include "consts.h" | 13 | #include "consts.h" |
14 | #include "sign.h" | ||
15 | |||
16 | class Renderer; | ||
14 | 17 | ||
15 | constexpr int TilesetIndex(int x, int y) { | 18 | constexpr int TilesetIndex(int x, int y) { |
16 | return x + y * 25; | 19 | return x + y * 25; |
@@ -23,13 +26,6 @@ enum class LoseState { | |||
23 | Outro | 26 | Outro |
24 | }; | 27 | }; |
25 | 28 | ||
26 | enum class SignInstructionState { | ||
27 | Hidden, | ||
28 | FadingIn, | ||
29 | Visible, | ||
30 | FadingOut | ||
31 | }; | ||
32 | |||
33 | struct Input { | 29 | struct Input { |
34 | bool left = false; | 30 | bool left = false; |
35 | bool right = false; | 31 | bool right = false; |
@@ -58,7 +54,7 @@ struct Kickup { | |||
58 | class Game { | 54 | class Game { |
59 | public: | 55 | public: |
60 | 56 | ||
61 | Game(std::mt19937& rng, Muxer& muxer); | 57 | Game(std::mt19937& rng, Muxer& muxer, Renderer& render); |
62 | 58 | ||
63 | void update(size_t dt); | 59 | void update(size_t dt); |
64 | 60 | ||
@@ -111,6 +107,7 @@ public: | |||
111 | int nextSignIndex = 0; | 107 | int nextSignIndex = 0; |
112 | SignInstructionState signInstructionState = SignInstructionState::Hidden; | 108 | SignInstructionState signInstructionState = SignInstructionState::Hidden; |
113 | Interpolation signFade; | 109 | Interpolation signFade; |
110 | Sign sign; | ||
114 | 111 | ||
115 | private: | 112 | private: |
116 | 113 | ||
@@ -144,6 +141,8 @@ private: | |||
144 | 141 | ||
145 | void performDash(); | 142 | void performDash(); |
146 | 143 | ||
144 | void updatePlaying(size_t frameTime); | ||
145 | |||
147 | }; | 146 | }; |
148 | 147 | ||
149 | #endif /* end of include guard: GAME_H_7D2B65AE */ | 148 | #endif /* end of include guard: GAME_H_7D2B65AE */ |