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

manuals tidy tier 3a: rondes, ternaris, anyofallof, padding, etc.

Browse Source
This commit is contained in:
Sergio Valor
2026-05-14 19:24:02 +02:00
parent 0b82be193f
commit a48fe51f73
13 changed files with 54 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/modulegame.cpp
+8 -4
View File
@@ -34,10 +34,14 @@ void ModuleGame::onEnter() {
// Audio::playMusic ja és idempotent: si la pista actual coincideix amb la
// demanada, no fa res. Per això podem cridar-lo cada onEnter sense
// desencadenar restarts indesitjats.
const char* music_name = info::ctx.num_piramide == 3 ? "piramide_3.ogg"
: info::ctx.num_piramide == 2 ? "piramide_2.ogg"
: info::ctx.num_piramide == 6 ? "secreta.ogg"
: "piramide_1_4_5.ogg";
const char* music_name = "piramide_1_4_5.ogg";
if (info::ctx.num_piramide == 3) {
music_name = "piramide_3.ogg";
} else if (info::ctx.num_piramide == 2) {
music_name = "piramide_2.ogg";
} else if (info::ctx.num_piramide == 6) {
music_name = "secreta.ogg";
}
Audio::get()->playMusic(music_name);
// Arranca el fade-in tick-based. El `PaletteFade` avança un pas (de
source/game/options.cpp
+2 -1
View File
@@ -346,7 +346,7 @@ namespace Options {
file << " shader_enabled: " << (video.shader_enabled ? "true" : "false") << "\n";
file << " supersampling: " << (video.supersampling ? "true" : "false") << "\n";
{
const char* m = "integer";
const char* m = nullptr;
switch (video.scaling_mode) {
case ScalingMode::DISABLED:
m = "disabled";
@@ -361,6 +361,7 @@ namespace Options {
m = "overscan";
break;
case ScalingMode::INTEGER:
default:
m = "integer";
break;
}
source/game/scenes/slides_scene.cpp
+6 -3
View File
@@ -117,9 +117,12 @@ namespace scenes {
case Phase::Slide2Enter:
case Phase::Slide3Enter: {
phase_acc_ms_ += delta_ms;
const int slide_idx = (phase_ == Phase::Slide1Enter ? 0
: phase_ == Phase::Slide2Enter ? 1
: 2);
int slide_idx = 2;
if (phase_ == Phase::Slide1Enter) {
slide_idx = 0;
} else if (phase_ == Phase::Slide2Enter) {
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);