jaildesigner-jailgames/aee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: tidy scenes (slides/secreta enums UPPER_CASE) i mapa membres _

Browse Source
This commit is contained in:
Sergio Valor
2026-05-16 14:46:22 +02:00
parent bbcc10da81
commit 4cac807ce2
6 changed files with 165 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/scenes/slides_scene.hpp
+22 -22
View File
@@ -18,18 +18,18 @@ namespace scenes {
// - altre cas (num_piramide == 1): gfx/intro.gif, sense música nova
//
// Flux:
// Slide1Enter (1600 ms scroll dreta→centre, easing outCubic)
// → Slide1Hold (4600 ms)
// → FadeOut1 + clear + reset paleta
// → Slide2Enter (1600 ms scroll esquerra→centre)
// → Slide2Hold (4600 ms)
// → FadeOut2 + clear + reset paleta
// → Slide3Enter (1600 ms scroll dreta→centre)
// → Slide3Hold (4600 ms)
// → FadeFinal (Ja::fadeOutMusic si num_piramide != 7 + fade paleta)
// SLIDE1_ENTER (1600 ms scroll dreta→centre, easing outCubic)
// → SLIDE1_HOLD (4600 ms)
// → FADE_OUT1 + clear + reset paleta
// → SLIDE2_ENTER (1600 ms scroll esquerra→centre)
// → SLIDE2_HOLD (4600 ms)
// → FADE_OUT2 + clear + reset paleta
// → SLIDE3_ENTER (1600 ms scroll dreta→centre)
// → SLIDE3_HOLD (4600 ms)
// → FADE_FINAL (Ja::fadeOutMusic si num_piramide != 7 + fade paleta)
// → Done
//
// Qualsevol tecla salta directament a FadeFinal (sense cortar la música
// Qualsevol tecla salta directament a FADE_FINAL (sense cortar la música
// si hem entrat per num_piramide==7, per fidelitat al vell).
//
// NextState:
@@ -42,21 +42,21 @@ namespace scenes {
void onEnter() override;
void tick(int delta_ms) override;
[[nodiscard]] auto done() const -> bool override { return phase_ == Phase::Done; }
[[nodiscard]] auto done() const -> bool override { return phase_ == Phase::DONE; }
[[nodiscard]] auto nextState() const -> int override { return next_state_; }
private:
enum class Phase : std::uint8_t {
Slide1Enter,
Slide1Hold,
FadeOut1,
Slide2Enter,
Slide2Hold,
FadeOut2,
Slide3Enter,
Slide3Hold,
FadeFinal,
Done,
SLIDE1_ENTER,
SLIDE1_HOLD,
FADE_OUT1,
SLIDE2_ENTER,
SLIDE2_HOLD,
FADE_OUT2,
SLIDE3_ENTER,
SLIDE3_HOLD,
FADE_FINAL,
DONE,
};
// Pinta un slide amb desplaçament horitzontal. `slide_idx` = 0..2
@@ -71,7 +71,7 @@ namespace scenes {
Jd8::Palette pal_active_{nullptr}; // propietat transferida a main_palette
PaletteFade fade_;
Phase phase_{Phase::Slide1Enter};
Phase phase_{Phase::SLIDE1_ENTER};
int phase_acc_ms_{0};
int num_piramide_at_start_{1};
int next_state_{0};