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/secreta_scene.cpp
+24 -24
View File
@@ -54,7 +54,7 @@ namespace scenes {
pal_active_ = new Color[256];
std::memcpy(pal_active_, pal_aux_, 768);
phase_ = Phase::InitialFadeOut;
phase_ = Phase::INITIAL_FADE_OUT;
phase_acc_ms_ = 0;
}
@@ -78,20 +78,20 @@ namespace scenes {
void SecretaScene::beginFinalFade() {
Audio::get()->fadeOutMusic(250);
fade_.startFadeOut();
phase_ = Phase::FinalFadeOut;
phase_ = Phase::FINAL_FADE_OUT;
}
void SecretaScene::tick(int delta_ms) {
// Skip per tecla (després del fade inicial, no mentre). Salta
// directament al FinalFadeOut. Mateix patró que el vell, on
// directament al FINAL_FADE_OUT. Mateix patró que el vell, on
// qualsevol tecla sortia del loop.
if (!skip_triggered_ && phase_ != Phase::InitialFadeOut && Ji::anyKey()) {
if (!skip_triggered_ && phase_ != Phase::INITIAL_FADE_OUT && Ji::anyKey()) {
skip_triggered_ = true;
beginFinalFade();
}
switch (phase_) {
case Phase::InitialFadeOut:
case Phase::INITIAL_FADE_OUT:
fade_.tick(delta_ms);
if (fade_.done()) {
// Ara main_palette (la vella) té tots els canals a 0.
@@ -100,12 +100,12 @@ namespace scenes {
// futures escriptures a pal_active_ afecten la pantalla.
Jd8::setScreenPalette(pal_active_);
Jd8::clearScreen(255);
phase_ = Phase::Tomba1ScrollIn;
phase_ = Phase::TOMBA1_SCROLL_IN;
phase_acc_ms_ = 0;
}
break;
case Phase::Tomba1ScrollIn: {
case Phase::TOMBA1_SCROLL_IN: {
phase_acc_ms_ += delta_ms;
const int contador = std::min(128, (phase_acc_ms_ / TICK_MS) + 1);
// Dos blits solapats: el primer avança a velocitat completa,
@@ -113,63 +113,63 @@ namespace scenes {
Jd8::blit(70, 60, gfx_, 0, contador, 178, 70);
Jd8::blitCK(70, 60, gfx_, 178, contador >> 1, 142, 70, 255);
if (phase_acc_ms_ >= TOMBA1_SCROLL_MS) {
phase_ = Phase::Tomba1Hold;
phase_ = Phase::TOMBA1_HOLD;
phase_acc_ms_ = 0;
}
break;
}
case Phase::Tomba1Hold:
case Phase::TOMBA1_HOLD:
phase_acc_ms_ += delta_ms;
if (phase_acc_ms_ >= TOMBA1_HOLD_MS) {
swapToTomba2();
phase_ = Phase::Tomba2ScrollIn;
phase_ = Phase::TOMBA2_SCROLL_IN;
phase_acc_ms_ = 0;
}
break;
case Phase::Tomba2ScrollIn: {
case Phase::TOMBA2_SCROLL_IN: {
phase_acc_ms_ += delta_ms;
const int contador = std::min(94, (phase_acc_ms_ / TICK_MS) + 1);
Jd8::blit(55, 53, gfx_, 0, 158 - contador, 211, contador);
if (phase_acc_ms_ >= TOMBA2_SCROLL_MS) {
phase_ = Phase::Tomba2Hold;
phase_ = Phase::TOMBA2_HOLD;
phase_acc_ms_ = 0;
}
break;
}
case Phase::Tomba2Hold:
case Phase::TOMBA2_HOLD:
phase_acc_ms_ += delta_ms;
if (phase_acc_ms_ >= TOMBA2_HOLD_MS) {
beginRedPulseSetup();
phase_ = Phase::Tomba2Reveal;
phase_ = Phase::TOMBA2_REVEAL;
phase_acc_ms_ = 0;
}
break;
case Phase::Tomba2Reveal: {
case Phase::TOMBA2_REVEAL: {
phase_acc_ms_ += delta_ms;
const int contador = std::min(80, (phase_acc_ms_ / TICK_MS) + 1);
// Revelat horitzontal simètric: l'amplada creix 2px per tick
// i el src_x es desplaça a l'esquerra el mateix.
Jd8::blit(80, 68, gfx_, 160 - (contador * 2), 0, contador * 2, 64);
if (phase_acc_ms_ >= TOMBA2_REVEAL_MS) {
phase_ = Phase::Tomba2RevealHold;
phase_ = Phase::TOMBA2_REVEAL_HOLD;
phase_acc_ms_ = 0;
}
break;
}
case Phase::Tomba2RevealHold:
case Phase::TOMBA2_REVEAL_HOLD:
phase_acc_ms_ += delta_ms;
if (phase_acc_ms_ >= TOMBA2_REVEAL_HOLD_MS) {
phase_ = Phase::RedPulse;
phase_ = Phase::RED_PULSE;
phase_acc_ms_ = 0;
}
break;
case Phase::RedPulse: {
case Phase::RED_PULSE: {
phase_acc_ms_ += delta_ms;
const int contador = std::min(51, phase_acc_ms_ / TICK_MS);
// Anima el canal R dels índexs 254 i 253 (aquest a la meitat
@@ -177,27 +177,27 @@ namespace scenes {
Jd8::setPaletteColor(254, contador + 12, 11, 11);
Jd8::setPaletteColor(253, (contador + 12) >> 1, 11, 11);
if (phase_acc_ms_ >= RED_PULSE_MS) {
phase_ = Phase::RedPulseHold;
phase_ = Phase::RED_PULSE_HOLD;
phase_acc_ms_ = 0;
}
break;
}
case Phase::RedPulseHold:
case Phase::RED_PULSE_HOLD:
phase_acc_ms_ += delta_ms;
if (phase_acc_ms_ >= RED_PULSE_HOLD_MS) {
beginFinalFade();
}
break;
case Phase::FinalFadeOut:
case Phase::FINAL_FADE_OUT:
fade_.tick(delta_ms);
if (fade_.done()) {
phase_ = Phase::Done;
phase_ = Phase::DONE;
}
break;
case Phase::Done:
case Phase::DONE:
break;
}
}