Arreglos en la estructura i format del codi

This commit is contained in:
2025-03-01 11:02:08 +01:00
parent c2040d3ded
commit 3562b139c3
10 changed files with 132 additions and 130 deletions

View File

@@ -59,7 +59,7 @@ Title::Title()
pSetSource(loading_screen_);
// Inicializa variables
state_ = options.section.subsection == Subsection::TITLE_WITH_LOADING_SCREEN ? show_loading_screen : show_menu;
state_ = options.section.subsection == Subsection::TITLE_WITH_LOADING_SCREEN ? TitleState::SHOW_LOADING_SCREEN : TitleState::SHOW_MENU;
options.section.section = Section::TITLE;
options.section.subsection = Subsection::NONE;
initMarquee();
@@ -91,7 +91,7 @@ void Title::initMarquee()
long_text_ = "HEY JAILERS!! IT'S 2022 AND WE'RE STILL ROCKING LIKE IT'S 1998!!! HAVE YOU HEARD IT? JAILGAMES ARE BACK!! YEEESSS BACK!! MORE THAN 10 TITLES ON JAILDOC'S KITCHEN!! THATS A LOOOOOOT OF JAILGAMES, BUT WHICH ONE WILL STRIKE FIRST? THERE IS ALSO A NEW DEVICE TO COME THAT WILL BLOW YOUR MIND WITH JAILGAMES ON THE GO: P.A.C.O. BUT WAIT! WHAT'S THAT BEAUTY I'M SEEING RIGHT OVER THERE?? OOOH THAT TINY MINIASCII IS PURE LOVE!! I WANT TO LICK EVERY BYTE OF IT!! OH SHIT! AND DON'T FORGET TO BRING BACK THOSE OLD AND FAT MS-DOS JAILGAMES TO GITHUB TO KEEP THEM ALIVE!! WHAT WILL BE THE NEXT JAILDOC RELEASE? WHAT WILL BE THE NEXT PROJECT TO COME ALIVE?? OH BABY WE DON'T KNOW BUT HERE YOU CAN FIND THE ANSWER, YOU JUST HAVE TO COMPLETE JAILDOCTOR'S DILEMMA ... COULD YOU?";
for (int i = 0; i < (int)long_text_.length(); ++i)
{
letter_t l;
TitleLetter l;
l.letter = long_text_.substr(i, 1);
l.x = 256;
l.enabled = false;
@@ -137,26 +137,26 @@ void Title::checkInput()
{
if (show_cheevos_)
{
if (input_->checkInput(input_down, REPEAT_TRUE))
if (input_->checkInput(InputAction::DOWN, REPEAT_TRUE))
{
moveCheevosList(1);
}
else if (input_->checkInput(input_up, REPEAT_TRUE))
else if (input_->checkInput(InputAction::UP, REPEAT_TRUE))
{
moveCheevosList(0);
}
else if (input_->checkInput(input_accept, REPEAT_FALSE))
else if (input_->checkInput(InputAction::ACCEPT, REPEAT_FALSE))
{
hideCheevosList();
counter_ = 0;
}
}
if (input_->checkInput(input_accept, REPEAT_FALSE))
if (input_->checkInput(InputAction::ACCEPT, REPEAT_FALSE))
{
if (state_ == show_loading_screen)
if (state_ == TitleState::SHOW_LOADING_SCREEN)
{
state_ = fade_loading_screen;
state_ = TitleState::FADE_LOADING_SCREEN;
}
}
@@ -232,24 +232,26 @@ void Title::update()
switch (state_)
{
case show_loading_screen:
case TitleState::SHOW_LOADING_SCREEN:
if (counter_ == 500)
{
counter_ = 0;
state_ = fade_loading_screen;
state_ = TitleState::FADE_LOADING_SCREEN;
}
break;
case fade_loading_screen:
case TitleState::FADE_LOADING_SCREEN:
if (counter_ % 4 == 0)
{
if (pFadePal())
{
counter_ = 0;
state_ = show_menu;
state_ = TitleState::SHOW_MENU;
}
}
break;
case show_menu:
case TitleState::SHOW_MENU:
// Actualiza la marquesina
updateMarquee();
@@ -277,7 +279,7 @@ void Title::render()
screen_->start();
screen_->clean(stringToColor(options.video.palette, "black"));
if (state_ == show_menu)
if (state_ == TitleState::SHOW_MENU)
{
// Dibuja la textura de fondo
SDL_RenderCopy(renderer_, bg_texture_, nullptr, nullptr);
@@ -389,7 +391,7 @@ void Title::fillTexture()
const int textSize = text_->getCharacterSize();
text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 11 * textSize, "1.PLAY", 1, textColor);
text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 13 * textSize, "2.ACHIEVEMENTS", 1, textColor);
// text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 15 * textSize, "3.REDEFINE KEYS", 1, textColor);
text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 15 * textSize, "3.REDEFINE KEYS", 1, textColor);
text_->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 20 * textSize, "ESC.EXIT GAME", 1, textColor);
// Devuelve el puntero del renderizador a su sitio