Menudo puto lio de renamar coses, a vore si tot va quedant al lloc que els structs i els enums estan revolant i duplicats per tots llocs

This commit is contained in:
2024-10-11 20:12:50 +02:00
parent a9ca23138d
commit 3a6950f3a4
28 changed files with 445 additions and 454 deletions

View File

@@ -9,7 +9,7 @@
#include "jail_audio.h" // for JA_StopMusic
#include "param.h" // for param
#include "screen.h" // for Screen
#include "section.h" // for name, name_e, options, options_e
#include "section.h" // for name, SectionName, options, SectionOptions
#include "sprite.h" // for Sprite
#include "texture.h" // for Texture
@@ -26,7 +26,7 @@ Logo::Logo()
// Inicializa variables
counter = 0;
section::name = section::NAME_LOGO;
section::name = section::Name::LOGO;
ticks = 0;
ticksSpeed = 15;
showSinceSprite_cm = 70;
@@ -80,7 +80,7 @@ void Logo::checkEvents()
// Evento de salida de la aplicación
if (event.type == SDL_QUIT)
{
section::name = section::NAME_QUIT;
section::name = section::Name::QUIT;
break;
}
@@ -102,8 +102,8 @@ void Logo::checkInput()
if (Input::get()->checkAnyButtonPressed())
{
JA_StopMusic();
section::name = section::NAME_TITLE;
section::options = section::OPTIONS_TITLE_1;
section::name = section::Name::TITLE;
section::options = section::Options::TITLE_1;
return;
}
@@ -196,7 +196,7 @@ void Logo::update()
// Comprueba si ha terminado el logo
if (counter == endLogo_cm + postLogoDuration)
{
section::name = section::NAME_INTRO;
section::name = section::Name::INTRO;
}
// Comprueba si se ha de mostrar el sprite
@@ -233,7 +233,7 @@ void Logo::run()
// Detiene la música
JA_StopMusic();
while (section::name == section::NAME_LOGO)
while (section::name == section::Name::LOGO)
{
checkInput();
update();