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.cpp
+27 -27
View File
@@ -60,7 +60,7 @@ namespace scenes {
Jd8::clearScreen(BG_COLOR_INDEX);
phase_ = Phase::Slide1Enter;
phase_ = Phase::SLIDE1_ENTER;
phase_acc_ms_ = 0;
next_state_ = 0;
}
@@ -96,7 +96,7 @@ namespace scenes {
Audio::get()->fadeOutMusic(250);
}
fade_.startFadeOut();
phase_ = Phase::FadeFinal;
phase_ = Phase::FADE_FINAL;
}
void SlidesScene::tick(int delta_ms) {
@@ -109,18 +109,18 @@ namespace scenes {
Audio::get()->fadeOutMusic(250);
}
fade_.startFadeOut();
phase_ = Phase::FadeFinal;
phase_ = Phase::FADE_FINAL;
}
switch (phase_) {
case Phase::Slide1Enter:
case Phase::Slide2Enter:
case Phase::Slide3Enter: {
case Phase::SLIDE1_ENTER:
case Phase::SLIDE2_ENTER:
case Phase::SLIDE3_ENTER: {
phase_acc_ms_ += delta_ms;
int slide_idx = 2;
if (phase_ == Phase::Slide1Enter) {
if (phase_ == Phase::SLIDE1_ENTER) {
slide_idx = 0;
} else if (phase_ == Phase::Slide2Enter) {
} else if (phase_ == Phase::SLIDE2_ENTER) {
slide_idx = 1;
}
const float t = std::min(1.0F, static_cast<float>(phase_acc_ms_) / static_cast<float>(SCROLL_MS));
@@ -131,55 +131,55 @@ namespace scenes {
if (phase_acc_ms_ >= SCROLL_MS) {
// Garanteix posició final exacta (pos_x=0).
drawSlide(slide_idx, 0);
if (phase_ == Phase::Slide1Enter) {
phase_ = Phase::Slide1Hold;
} else if (phase_ == Phase::Slide2Enter) {
phase_ = Phase::Slide2Hold;
if (phase_ == Phase::SLIDE1_ENTER) {
phase_ = Phase::SLIDE1_HOLD;
} else if (phase_ == Phase::SLIDE2_ENTER) {
phase_ = Phase::SLIDE2_HOLD;
} else {
phase_ = Phase::Slide3Hold;
phase_ = Phase::SLIDE3_HOLD;
}
phase_acc_ms_ = 0;
}
break;
}
case Phase::Slide1Hold:
case Phase::Slide2Hold:
case Phase::SLIDE1_HOLD:
case Phase::SLIDE2_HOLD:
phase_acc_ms_ += delta_ms;
if (phase_acc_ms_ >= HOLD_MS) {
fade_.startFadeOut();
if (phase_ == Phase::Slide1Hold) {
phase_ = Phase::FadeOut1;
if (phase_ == Phase::SLIDE1_HOLD) {
phase_ = Phase::FADE_OUT1;
} else {
phase_ = Phase::FadeOut2;
phase_ = Phase::FADE_OUT2;
}
phase_acc_ms_ = 0;
}
break;
case Phase::Slide3Hold:
case Phase::SLIDE3_HOLD:
phase_acc_ms_ += delta_ms;
if (phase_acc_ms_ >= HOLD_MS) {
beginFinalFade();
}
break;
case Phase::FadeOut1:
case Phase::FadeOut2:
case Phase::FADE_OUT1:
case Phase::FADE_OUT2:
fade_.tick(delta_ms);
if (fade_.done()) {
restorePalette();
Jd8::clearScreen(BG_COLOR_INDEX);
if (phase_ == Phase::FadeOut1) {
phase_ = Phase::Slide2Enter;
if (phase_ == Phase::FADE_OUT1) {
phase_ = Phase::SLIDE2_ENTER;
} else {
phase_ = Phase::Slide3Enter;
phase_ = Phase::SLIDE3_ENTER;
}
phase_acc_ms_ = 0;
}
break;
case Phase::FadeFinal:
case Phase::FADE_FINAL:
fade_.tick(delta_ms);
if (fade_.done()) {
if (num_piramide_at_start_ == 7) {
@@ -188,11 +188,11 @@ namespace scenes {
} else {
next_state_ = 0;
}
phase_ = Phase::Done;
phase_ = Phase::DONE;
}
break;
case Phase::Done:
case Phase::DONE:
break;
}
}