diff --git a/source/title.cpp b/source/title.cpp index 0f76c10..259586c 100644 --- a/source/title.cpp +++ b/source/title.cpp @@ -1,25 +1,25 @@ #include "title.h" -#include // for SDLK_1, SDLK_2, SDLK_3 -#include // for SDL_Renderer -#include // for SDL_GetTicks -#include // for allocator, basic_string, char_traits -#include // for vector -#include "asset.h" // for Asset -#include "define_buttons.h" // for DefineButtons -#include "fade.h" // for Fade, FADE_RANDOM_SQUARE -#include "game_logo.h" // for GameLogo -#include "global_inputs.h" // for checkGlobalInputs -#include "input.h" // for Input, inputs_e, INPUT_DO_NOT_ALLOW_RE... -#include "jail_audio.h" // for JA_GetMusicState, JA_Music_state, JA_P... -#include "lang.h" // for getText -#include "options.h" // for options -#include "param.h" // for param -#include "screen.h" // for Screen -#include "section.h" // for options_e, options, name_e, name -#include "sprite.h" // for Sprite -#include "text.h" // for Text, TXT_CENTER, TXT_SHADOW -#include "texture.h" // for Texture -#include "tiled_bg.h" // for Tiledbg, TILED_MODE_RANDOM +#include // for SDLK_1, SDLK_2, SDLK_3 +#include // for SDL_Renderer +#include // for SDL_GetTicks +#include // for allocator, basic_string, char_traits +#include // for vector +#include "asset.h" // for Asset +#include "define_buttons.h" // for DefineButtons +#include "fade.h" // for Fade, FADE_RANDOM_SQUARE +#include "game_logo.h" // for GameLogo +#include "global_inputs.h" // for checkGlobalInputs +#include "input.h" // for Input, inputs_e, INPUT_DO_NOT_ALLOW_RE... +#include "jail_audio.h" // for JA_GetMusicState, JA_Music_state, JA_P... +#include "lang.h" // for getText +#include "options.h" // for options +#include "param.h" // for param +#include "screen.h" // for Screen +#include "section.h" // for options_e, options, name_e, name +#include "sprite.h" // for Sprite +#include "text.h" // for Text, TXT_CENTER, TXT_SHADOW +#include "texture.h" // for Texture +#include "tiled_bg.h" // for Tiledbg, TILED_MODE_RANDOM struct JA_Music_t; // Constructor @@ -299,12 +299,15 @@ void Title::checkInput() // Comprueba el botón de START de los mandos if (input->checkInput(input_start, INPUT_DO_NOT_ALLOW_REPEAT, INPUT_USE_GAMECONTROLLER, i)) - { - if (section::options == section::OPTIONS_TITLE_2 || ALLOW_TITLE_ANIMATION_SKIP) + { // Si no está el botón de servicio activo + if (!input->checkInput(input_service, INPUT_ALLOW_REPEAT, INPUT_USE_GAMECONTROLLER, i)) { - fade->activate(); - postFade = options.controller[i].playerId; - return; + if (section::options == section::OPTIONS_TITLE_2 || ALLOW_TITLE_ANIMATION_SKIP) + { + fade->activate(); + postFade = options.controller[i].playerId; + return; + } } } } @@ -313,7 +316,7 @@ void Title::checkInput() // Comprueba el input para el resto de objetos screen->checkInput(); defineButtons->checkInput(); - + // Comprueba los inputs que se pueden introducir en cualquier sección del juego checkGlobalInputs(); }