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

fix: tidy namespace Scenes::/Info:: PascalCase i locals UPPER_CASE

Browse Source
This commit is contained in:
Sergio Valor
2026-05-16 15:06:16 +02:00
parent ae89b252e2
commit ae359f4a1e
55 changed files with 303 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/scenes/slides_scene.cpp
+17 -17
View File
@@ -20,15 +20,15 @@ namespace {
constexpr int BG_COLOR_INDEX = 255;
// Desplaçament inicial del slide segons direcció del wipe.
// Slide 1 i 3: "scroll in from right" (pos_x va de 320 → 0).
// Slide 2: "wipe reverse" (pos_x va de -320 → 0), el mateix efecte
// Slide 1 i 3: "scroll in from right" (POS_X va de 320 → 0).
// Slide 2: "wipe reverse" (POS_X va de -320 → 0), el mateix efecte
// estrany del doSlides vell on la imatge es desplaça des de l'esquerra
// però revela primer el lateral dret del src.
constexpr int SLIDE_START_X[3] = {320, -320, 320};
} // namespace
namespace scenes {
namespace Scenes {
SlidesScene::~SlidesScene() {
delete[] pal_aux_;
@@ -36,13 +36,13 @@ namespace scenes {
}
void SlidesScene::onEnter() {
num_piramide_at_start_ = info::ctx.num_piramide;
num_piramide_at_start_ = Info::ctx.num_piramide;
const char* arxiu = nullptr;
if (num_piramide_at_start_ == 7) {
// loop=1 per replicar el vell `play_music("final.ogg", 1)`.
playMusic("music/final.ogg", 1);
arxiu = (info::ctx.diners < 200) ? "gfx/intro2.gif" : "gfx/intro3.gif";
arxiu = (Info::ctx.diners < 200) ? "gfx/intro2.gif" : "gfx/intro3.gif";
} else {
arxiu = "gfx/intro.gif";
}
@@ -65,12 +65,12 @@ namespace scenes {
next_state_ = 0;
}
void SlidesScene::drawSlide(int slide_idx, int pos_x) {
const int src_y = slide_idx * SLIDE_H;
void SlidesScene::drawSlide(int slide_idx, int POS_X) {
const int SRC_Y = slide_idx * SLIDE_H;
// Clipping manual: translada un rect de 320×65 des de (pos_x, SLIDE_Y)
// Clipping manual: translada un rect de 320×65 des de (POS_X, SLIDE_Y)
// a l'àrea visible (0..319, SLIDE_Y..SLIDE_Y+64).
int dst_x = pos_x;
int dst_x = POS_X;
int src_x = 0;
int w = 320;
@@ -83,7 +83,7 @@ namespace scenes {
}
if (w > 0) {
Jd8::blit(dst_x, SLIDE_Y, gfx_, src_x, src_y, w, SLIDE_H);
Jd8::blit(dst_x, SLIDE_Y, gfx_, src_x, SRC_Y, w, SLIDE_H);
}
}
@@ -123,13 +123,13 @@ namespace scenes {
} 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));
const float eased = Easing::outCubic(t);
const int pos_x = Easing::lerpInt(SLIDE_START_X[slide_idx], 0, eased);
drawSlide(slide_idx, pos_x);
const float T = std::min(1.0F, static_cast<float>(phase_acc_ms_) / static_cast<float>(SCROLL_MS));
const float EASED = Easing::outCubic(T);
const int POS_X = Easing::lerpInt(SLIDE_START_X[slide_idx], 0, EASED);
drawSlide(slide_idx, POS_X);
if (phase_acc_ms_ >= SCROLL_MS) {
// Garanteix posició final exacta (pos_x=0).
// Garanteix posició final exacta (POS_X=0).
drawSlide(slide_idx, 0);
if (phase_ == Phase::SLIDE1_ENTER) {
phase_ = Phase::SLIDE1_HOLD;
@@ -183,7 +183,7 @@ namespace scenes {
fade_.tick(delta_ms);
if (fade_.done()) {
if (num_piramide_at_start_ == 7) {
info::ctx.num_piramide = 8;
Info::ctx.num_piramide = 8;
next_state_ = 1;
} else {
next_state_ = 0;
@@ -197,4 +197,4 @@ namespace scenes {
}
}
} // namespace scenes
} // namespace Scenes