diff options
| author | Star Rauchenberger <fefferburbia@gmail.com> | 2022-03-16 11:53:46 -0400 |
|---|---|---|
| committer | Star Rauchenberger <fefferburbia@gmail.com> | 2022-03-16 11:53:46 -0400 |
| commit | 8713d03831226dcd559c6a1e2b1c7b0d7c660bac (patch) | |
| tree | fd0c1e7ff253e3c69646d727bc49a112a71f5ca9 /src/game.h | |
| parent | 4b52f51404aca45a7d5d8e5998649ff67df97bbd (diff) | |
| download | ether-8713d03831226dcd559c6a1e2b1c7b0d7c660bac.tar.gz ether-8713d03831226dcd559c6a1e2b1c7b0d7c660bac.tar.bz2 ether-8713d03831226dcd559c6a1e2b1c7b0d7c660bac.zip | |
added signs (which can't be read yet)
Diffstat (limited to 'src/game.h')
| -rw-r--r-- | src/game.h | 14 |
1 files changed, 13 insertions, 1 deletions
| diff --git a/src/game.h b/src/game.h index f307156..71685e6 100644 --- a/src/game.h +++ b/src/game.h | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include "consts.h" | 13 | #include "consts.h" |
| 14 | 14 | ||
| 15 | constexpr int TilesetIndex(int x, int y) { | 15 | constexpr int TilesetIndex(int x, int y) { |
| 16 | return x + y * 24; | 16 | return x + y * 25; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | enum class LoseState { | 19 | enum class LoseState { |
| @@ -23,6 +23,13 @@ enum class LoseState { | |||
| 23 | Outro | 23 | Outro |
| 24 | }; | 24 | }; |
| 25 | 25 | ||
| 26 | enum class SignInstructionState { | ||
| 27 | Hidden, | ||
| 28 | FadingIn, | ||
| 29 | Visible, | ||
| 30 | FadingOut | ||
| 31 | }; | ||
| 32 | |||
| 26 | struct Input { | 33 | struct Input { |
| 27 | bool left = false; | 34 | bool left = false; |
| 28 | bool right = false; | 35 | bool right = false; |
| @@ -100,6 +107,11 @@ public: | |||
| 100 | Timer losePopPlayerTimer = {3000}; | 107 | Timer losePopPlayerTimer = {3000}; |
| 101 | //Timer zoomTimer = {62}; | 108 | //Timer zoomTimer = {62}; |
| 102 | 109 | ||
| 110 | std::vector<std::string> signTexts; | ||
| 111 | int nextSignIndex = 0; | ||
| 112 | SignInstructionState signInstructionState = SignInstructionState::Hidden; | ||
| 113 | Interpolation signFade; | ||
| 114 | |||
| 103 | private: | 115 | private: |
| 104 | 116 | ||
| 105 | void tick( | 117 | void tick( |
