summary refs log tree commit diff stats
path: root/src/game.h
diff options
context:
space:
mode:
authorStar Rauchenberger <fefferburbia@gmail.com>2022-03-19 16:46:19 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2022-03-19 16:46:19 -0400
commitb2f0190f6b2a227a21dd4909476171f7cc371a2d (patch)
tree0b12cdc515198a6daf5d0a39ed40f581e410cfba /src/game.h
parent81e8c1dae2e7e4be632d6e81d765b5dd43ea3927 (diff)
downloadether-b2f0190f6b2a227a21dd4909476171f7cc371a2d.tar.gz
ether-b2f0190f6b2a227a21dd4909476171f7cc371a2d.tar.bz2
ether-b2f0190f6b2a227a21dd4909476171f7cc371a2d.zip
menu!
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/game.h b/src/game.h index 5f13672..839be67 100644 --- a/src/game.h +++ b/src/game.h
@@ -12,6 +12,7 @@
12#include "interpolation.h" 12#include "interpolation.h"
13#include "consts.h" 13#include "consts.h"
14#include "sign.h" 14#include "sign.h"
15#include "menu.h"
15 16
16class Renderer; 17class Renderer;
17 18
@@ -23,7 +24,8 @@ enum class LoseState {
23 None, 24 None,
24 PoppingLamps, 25 PoppingLamps,
25 PoppingPlayer, 26 PoppingPlayer,
26 Outro 27 Outro,
28 Done
27}; 29};
28 30
29struct Input { 31struct Input {
@@ -60,8 +62,10 @@ public:
60 62
61 std::mt19937& rng; 63 std::mt19937& rng;
62 Muxer& muxer; 64 Muxer& muxer;
65 Renderer& renderer;
63 66
64 bool quit = false; 67 bool quit = false;
68 bool quitting = false; // <- whether we will quit after losing, vs starting a new game
65 LoseState losing = LoseState::None; 69 LoseState losing = LoseState::None;
66 70
67 Map map; 71 Map map;
@@ -110,6 +114,8 @@ public:
110 Interpolation signFade; 114 Interpolation signFade;
111 Sign sign; 115 Sign sign;
112 116
117 Menu menu;
118
113private: 119private:
114 120
115 void tickDirty(bool onlyDark); 121 void tickDirty(bool onlyDark);