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

This commit is contained in:
2026-05-16 15:06:16 +02:00
parent ae89b252e2
commit ae359f4a1e
55 changed files with 303 additions and 303 deletions
+14 -14
View File
@@ -27,7 +27,7 @@ Mapa::~Mapa() {
}
void Mapa::draw() {
if (info::ctx.num_piramide != 4) {
if (Info::ctx.num_piramide != 4) {
switch (sam_->o) {
case 0: // Down
Jd8::blitCKToSurface(sam_->x, sam_->y, this->gfx_, 15, 125 + sam_->frame_pejades, 15, 1, this->fondo_, 255);
@@ -93,7 +93,7 @@ auto Mapa::novaMomia() -> bool {
void Mapa::preparaFondoEstatic() {
// Prepara el fondo esttic de l'habitaci
this->fondo_ = Jd8::newSurface();
if (info::ctx.num_piramide == 6) {
if (Info::ctx.num_piramide == 6) {
Jd8::blitToSurface(9, 2, this->gfx_, 227, 185, 92, 7, this->fondo_); // Text "SECRETA"
} else {
Jd8::blitToSurface(9, 2, this->gfx_, 60, 185, 39, 7, this->fondo_); // Text "NIVELL"
@@ -101,14 +101,14 @@ void Mapa::preparaFondoEstatic() {
}
Jd8::blitToSurface(130, 2, this->gfx_, 225, 192, 19, 8, this->fondo_); // Montonet de monedes + signe '='
Jd8::blitToSurface(220, 2, this->gfx_, 160, 185, 48, 7, this->fondo_); // Text "ENERGIA"
if (info::ctx.diners >= 200) {
if (Info::ctx.diners >= 200) {
Jd8::blitToSurface(175, 3, this->gfx_, 60, 193, 7, 6, this->fondo_);
}
// Pinta taulells
for (int y = 0; y < 11; y++) {
for (int x = 0; x < 19; x++) {
switch (info::ctx.num_piramide) {
switch (Info::ctx.num_piramide) {
case 1:
Jd8::blitToSurface(20 + (x * 15), 30 + (y * 15), this->gfx_, 0, 80, 15, 15, this->fondo_);
break;
@@ -154,7 +154,7 @@ void Mapa::preparaFondoEstatic() {
// Pinta la porta
Jd8::blitCKToSurface(150, 18, this->gfx_, 0, 143, 15, 12, this->fondo_, 255);
if (info::ctx.num_piramide == 2) {
if (Info::ctx.num_piramide == 2) {
Jd8::blitToSurface(5, 100, this->gfx_, 30, 140, 15, 15, this->fondo_);
}
}
@@ -166,12 +166,12 @@ void swap(Uint8& a, Uint8& b) noexcept {
}
void Mapa::preparaTombes() {
const Uint8 contingut = info::ctx.num_piramide == 6 ? CONTE_DIAMANT : CONTE_RES;
int cx = info::ctx.num_piramide == 6 ? 270 : 0;
int cy = info::ctx.num_piramide == 6 ? 50 : 0;
const Uint8 CONTINGUT = Info::ctx.num_piramide == 6 ? CONTE_DIAMANT : CONTE_RES;
int cx = Info::ctx.num_piramide == 6 ? 270 : 0;
int cy = Info::ctx.num_piramide == 6 ? 50 : 0;
for (auto& tombe : this->tombes) {
tombe.contingut = contingut;
tombe.contingut = CONTINGUT;
tombe.oberta = false;
tombe.costat[0] = false;
tombe.costat[1] = false;
@@ -180,7 +180,7 @@ void Mapa::preparaTombes() {
tombe.x = cx;
tombe.y = cy;
}
if (info::ctx.num_piramide == 6) {
if (Info::ctx.num_piramide == 6) {
return;
}
this->tombes[0].contingut = CONTE_FARAO;
@@ -261,7 +261,7 @@ void Mapa::comprovaCaixa(Uint8 num) {
break;
case CONTE_TRESOR:
this->tombes[num].x = 100;
info::ctx.diners++;
Info::ctx.diners++;
break;
case CONTE_FARAO:
this->tombes[num].x = 150;
@@ -281,9 +281,9 @@ void Mapa::comprovaCaixa(Uint8 num) {
break;
case CONTE_DIAMANT:
this->tombes[num].y = 70;
info::ctx.diamants++;
info::ctx.diners += VALOR_DIAMANT;
if (info::ctx.diamants == 16) {
Info::ctx.diamants++;
Info::ctx.diners += VALOR_DIAMANT;
if (Info::ctx.diamants == 16) {
this->farao_ = this->clau_ = true;
}
break;