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

@@ -10,7 +10,7 @@
#include "lang.h" // for getText
#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 "smart_sprite.h" // for SmartSprite
#include "text.h" // for Text
#include "texture.h" // for Texture
@@ -30,8 +30,8 @@ Intro::Intro(JA_Music_t *music)
text = std::make_shared<Text>(Asset::get()->get("nokia.png"), Asset::get()->get("nokia.txt"), renderer);
// Inicializa variables
section::name = section::NAME_INTRO;
section::options = section::OPTIONS_NULL;
section::name = section::Name::INTRO;
section::options = section::Options::NONE;
ticks = 0;
ticksSpeed = 15;
scene = 1;
@@ -172,7 +172,7 @@ void Intro::checkEvents()
{
case SDL_QUIT:
{
section::name = section::NAME_QUIT;
section::name = section::Name::QUIT;
break;
}
@@ -198,8 +198,8 @@ void Intro::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;
}
@@ -355,8 +355,8 @@ void Intro::updateScenes()
bitmaps[5]->setEnabled(false);
texts[8]->setEnabled(false);
JA_StopMusic();
section::name = section::NAME_TITLE;
section::options = section::OPTIONS_TITLE_1;
section::name = section::Name::TITLE;
section::options = section::Options::TITLE_1;
}
break;
@@ -422,7 +422,7 @@ void Intro::run()
{
JA_PlayMusic(music, 0);
while (section::name == section::NAME_INTRO)
while (section::name == section::Name::INTRO)
{
checkInput();
update();