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

fase 1: jail i game a c++ idiomàtic (raii, info::ctx, cheats arreglats)

Browse Source
This commit is contained in:
Sergio
2026-04-15 18:03:46 +02:00
parent 2c833d086e
commit 7f85b50c63
18 changed files with 834 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/game/modulesequence.cpp
View File

@@ -18,9 +18,9 @@ ModuleSequence::~ModuleSequence(void) {
}
int ModuleSequence::Go() {
if (info::num_piramide == 6 && info::diners < 200) info::num_piramide = 7;
if (info::ctx.num_piramide == 6 && info::ctx.diners < 200) info::ctx.num_piramide = 7;
switch (info::num_piramide) {
switch (info::ctx.num_piramide) {
case 255: // Intro
doIntro();
break;
@@ -53,22 +53,22 @@ int ModuleSequence::Go() {
if (JG_Quitting()) {
return -1;
} else {
if (info::num_piramide == 255) {
info::num_piramide = 0;
if (info::ctx.num_piramide == 255) {
info::ctx.num_piramide = 0;
return 1;
} else if (info::num_piramide == 0) {
info::num_piramide = 1;
// info::num_piramide = 6;
// info::diners = 200;
} else if (info::ctx.num_piramide == 0) {
info::ctx.num_piramide = 1;
// info::ctx.num_piramide = 6;
// info::ctx.diners = 200;
return 1;
} else if (info::num_piramide == 7) {
info::num_piramide = 8;
} else if (info::ctx.num_piramide == 7) {
info::ctx.num_piramide = 8;
return 1;
} else if (info::num_piramide == 8) {
info::num_piramide = 255;
} else if (info::ctx.num_piramide == 8) {
info::ctx.num_piramide = 255;
return 1;
} else if (info::num_piramide == 100) {
info::num_piramide = 0;
} else if (info::ctx.num_piramide == 100) {
info::ctx.num_piramide = 0;
return 1;
} else {
return 0;
@@ -969,7 +969,7 @@ void ModuleSequence::doMenu() {
JD8_BlitCK(303, 193, gfx, 305, 143, 15, 5, 255); // versio
if (contador % 100 > 30) JD8_BlitCK(98, 130, gfx, 161, 92, 127, 9, 255); // pulsa tecla...
if ((contador % 100 > 30) && info::nou_personatge) JD8_BlitCK(68, 141, gfx, 128, 105, 189, 9, 255); // 'p' per a personatge nou...
if ((contador % 100 > 30) && info::ctx.nou_personatge) JD8_BlitCK(68, 141, gfx, 128, 105, 189, 9, 255); // 'p' per a personatge nou...
JD8_Flip();
@@ -990,7 +990,7 @@ void ModuleSequence::doMenu() {
JI_Update();
}
}
info::pepe_activat = JI_KeyPressed(SDL_SCANCODE_P);
info::ctx.pepe_activat = JI_KeyPressed(SDL_SCANCODE_P);
JI_DisableKeyboard(60);
JD8_FreeSurface(fondo);
JD8_FreeSurface(gfx);
@@ -1001,9 +1001,9 @@ void ModuleSequence::doSlides() {
JG_SetUpdateTicks(20);
const char* arxiu;
if (info::num_piramide == 7) {
if (info::ctx.num_piramide == 7) {
play_music("00000005.ogg", 1);
if (info::diners < 200) {
if (info::ctx.diners < 200) {
arxiu = "intro2.gif";
} else {
arxiu = "intro3.gif";
@@ -1066,7 +1066,7 @@ void ModuleSequence::doSlides() {
step++;
break;
case 8:
if (info::num_piramide != 7) JA_FadeOutMusic(250);
if (info::ctx.num_piramide != 7) JA_FadeOutMusic(250);
exit = true;
break;
}
@@ -1090,7 +1090,7 @@ void ModuleSequence::doBanner() {
JD8_Blit(81, 24, gfx, 81, 155, 168, 21);
JD8_Blit(39, 150, gfx, 39, 175, 248, 20);
switch (info::num_piramide) {
switch (info::ctx.num_piramide) {
case 2:
JD8_Blit(82, 60, gfx, 0, 0, 160, 75);
break;
@@ -1245,7 +1245,7 @@ void ModuleSequence::doCredits() {
JD8_BlitCK(100, 20, vaddr2, 85, 0, 120, 140, 0);
}
if (info::diamants == 16) {
if (info::ctx.diamants == 16) {
// scroll_final_joc(vaddr3, vaddr, contador_final);
JD8_BlitCKScroll(50, vaddr3, ((contador >> 3) % 320) + 1, 0, 50, 255);
JD8_BlitCKScroll(50, vaddr3, ((contador >> 2) % 320) + 1, 50, 50, 255);
@@ -1269,7 +1269,7 @@ void ModuleSequence::doCredits() {
FILE* ini = fopen("trick.ini", "wb");
fwrite("1", 1, 1, ini);
fclose(ini);
info::nou_personatge = true;
info::ctx.nou_personatge = true;
JD8_FreeSurface(vaddr3);
JD8_FreeSurface(vaddr2);
@@ -1280,7 +1280,7 @@ void ModuleSequence::doMort() {
JI_DisableKeyboard(60);
info::vida = 5;
info::ctx.vida = 5;
this->contador = 1000;
JD8_Surface gfx = JD8_LoadSurface("gameover.gif");