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 21:07:50 -0400
committerStar Rauchenberger <fefferburbia@gmail.com>2022-03-19 21:07:50 -0400
commit514b240348a7c401fa6725ae74540d5f3ee29cfb (patch)
tree6c4dd02b3aacc1bf57f8e4c2b2b46ed34fa73fdd /src/game.h
parent5c92093bd82b54e79c63937cb0dbefabc5f47624 (diff)
downloadether-514b240348a7c401fa6725ae74540d5f3ee29cfb.tar.gz
ether-514b240348a7c401fa6725ae74540d5f3ee29cfb.tar.bz2
ether-514b240348a7c401fa6725ae74540d5f3ee29cfb.zip
added fade in to new game
and fixed music on new game
Diffstat (limited to 'src/game.h')
-rw-r--r--src/game.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game.h b/src/game.h index 839be67..3b092dd 100644 --- a/src/game.h +++ b/src/game.h
@@ -21,6 +21,7 @@ constexpr int TilesetIndex(int x, int y) {
21} 21}
22 22
23enum class LoseState { 23enum class LoseState {
24 NewGame,
24 None, 25 None,
25 PoppingLamps, 26 PoppingLamps,
26 PoppingPlayer, 27 PoppingPlayer,
@@ -66,7 +67,10 @@ public:
66 67
67 bool quit = false; 68 bool quit = false;
68 bool quitting = false; // <- whether we will quit after losing, vs starting a new game 69 bool quitting = false; // <- whether we will quit after losing, vs starting a new game
69 LoseState losing = LoseState::None; 70 LoseState losing = LoseState::NewGame;
71
72 Interpolation initialFade;
73 bool startedMusic = false;
70 74
71 Map map; 75 Map map;
72 std::list<Kickup> kickups; 76 std::list<Kickup> kickups;