diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-10 12:11:27 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-02-10 12:11:27 -0500 |
commit | 31dc0e443efc0aae48e11a0d98e699dbed5c7dcf (patch) | |
tree | 17e044698531fc1af82dddcbd144ae93d3ae0252 /src/game.h | |
parent | fb58cb31804da7e5e40fc861927060a183962441 (diff) | |
download | tanetane-31dc0e443efc0aae48e11a0d98e699dbed5c7dcf.tar.gz tanetane-31dc0e443efc0aae48e11a0d98e699dbed5c7dcf.tar.bz2 tanetane-31dc0e443efc0aae48e11a0d98e699dbed5c7dcf.zip |
Added fade out around map change
Also moved script system first in the loop so that the camera can catch up before rendering. Also added a map change from map 2 back to map 1.
Diffstat (limited to 'src/game.h')
-rw-r--r-- | src/game.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game.h b/src/game.h index 8ea7576..bb88dec 100644 --- a/src/game.h +++ b/src/game.h | |||
@@ -79,6 +79,10 @@ public: | |||
79 | 79 | ||
80 | const Font& getFont() const { return font_; } | 80 | const Font& getFont() const { return font_; } |
81 | 81 | ||
82 | double getFadeoutProgress() const { return fadeout_; } | ||
83 | |||
84 | void setFadeoutProgress(double val) { fadeout_ = val; } | ||
85 | |||
82 | private: | 86 | private: |
83 | 87 | ||
84 | void clearSprites(); | 88 | void clearSprites(); |
@@ -94,6 +98,7 @@ private: | |||
94 | std::map<std::string, int> spritesByAlias_; | 98 | std::map<std::string, int> spritesByAlias_; |
95 | std::unique_ptr<Map> map_; | 99 | std::unique_ptr<Map> map_; |
96 | Font font_; | 100 | Font font_; |
101 | double fadeout_ = 0.0; | ||
97 | }; | 102 | }; |
98 | 103 | ||
99 | #endif /* end of include guard: GAME_H_E6F1396E */ | 104 | #endif /* end of include guard: GAME_H_E6F1396E */ |