Pots pasar quan mostra el nom que has introdiut apretant qualsevol botó de disparar
This commit is contained in:
@@ -555,8 +555,10 @@ void Director::setFileList()
|
|||||||
|
|
||||||
// Si falta algun fichero, sale del programa
|
// Si falta algun fichero, sale del programa
|
||||||
if (!Asset::get()->check())
|
if (!Asset::get()->check())
|
||||||
|
{
|
||||||
throw std::runtime_error("Falta algun fichero");
|
throw std::runtime_error("Falta algun fichero");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Comprueba los parametros del programa
|
// Comprueba los parametros del programa
|
||||||
void Director::checkProgramArguments(int argc, const char *argv[])
|
void Director::checkProgramArguments(int argc, const char *argv[])
|
||||||
|
|||||||
@@ -1555,7 +1555,7 @@ void Game::handlePlayersInput()
|
|||||||
// Gestiona la continuación del jugador.
|
// Gestiona la continuación del jugador.
|
||||||
handlePlayerContinue(player);
|
handlePlayerContinue(player);
|
||||||
}
|
}
|
||||||
else if (player->isEnteringName() || player->isEnteringNameGameCompleted())
|
else if (player->isEnteringName() || player->isEnteringNameGameCompleted() || player->isShowingName())
|
||||||
{
|
{
|
||||||
// Gestiona la introducción del nombre del jugador.
|
// Gestiona la introducción del nombre del jugador.
|
||||||
handleNameInput(player);
|
handleNameInput(player);
|
||||||
@@ -1650,7 +1650,11 @@ void Game::handleNameInput(const std::shared_ptr<Player> &player)
|
|||||||
input_->checkInput(InputType::FIRE_CENTER, INPUT_DO_NOT_ALLOW_REPEAT, options.controllers[controllerIndex].type, options.controllers[controllerIndex].index) ||
|
input_->checkInput(InputType::FIRE_CENTER, INPUT_DO_NOT_ALLOW_REPEAT, options.controllers[controllerIndex].type, options.controllers[controllerIndex].index) ||
|
||||||
input_->checkInput(InputType::FIRE_RIGHT, INPUT_DO_NOT_ALLOW_REPEAT, options.controllers[controllerIndex].type, options.controllers[controllerIndex].index))
|
input_->checkInput(InputType::FIRE_RIGHT, INPUT_DO_NOT_ALLOW_REPEAT, options.controllers[controllerIndex].type, options.controllers[controllerIndex].index))
|
||||||
{
|
{
|
||||||
if (player->getEnterNamePositionOverflow())
|
if (player->isShowingName())
|
||||||
|
{
|
||||||
|
player->setPlayingState(PlayerState::CONTINUE);
|
||||||
|
}
|
||||||
|
else if (player->getEnterNamePositionOverflow())
|
||||||
{
|
{
|
||||||
player->setInput(InputType::START);
|
player->setInput(InputType::START);
|
||||||
addScoreToScoreBoard(player);
|
addScoreToScoreBoard(player);
|
||||||
|
|||||||
@@ -208,6 +208,7 @@ public:
|
|||||||
bool isContinue() const { return playing_state_ == PlayerState::CONTINUE; }
|
bool isContinue() const { return playing_state_ == PlayerState::CONTINUE; }
|
||||||
bool isDying() const { return playing_state_ == PlayerState::DYING; }
|
bool isDying() const { return playing_state_ == PlayerState::DYING; }
|
||||||
bool isEnteringName() const { return playing_state_ == PlayerState::ENTERING_NAME; }
|
bool isEnteringName() const { return playing_state_ == PlayerState::ENTERING_NAME; }
|
||||||
|
bool isShowingName() const { return playing_state_ == PlayerState::SHOWING_NAME; }
|
||||||
bool isEnteringNameGameCompleted() const { return playing_state_ == PlayerState::ENTERING_NAME_GAME_COMPLETED; }
|
bool isEnteringNameGameCompleted() const { return playing_state_ == PlayerState::ENTERING_NAME_GAME_COMPLETED; }
|
||||||
bool isLeavingScreen() const { return playing_state_ == PlayerState::LEAVING_SCREEN; }
|
bool isLeavingScreen() const { return playing_state_ == PlayerState::LEAVING_SCREEN; }
|
||||||
bool isGameOver() const { return playing_state_ == PlayerState::GAME_OVER; }
|
bool isGameOver() const { return playing_state_ == PlayerState::GAME_OVER; }
|
||||||
|
|||||||
Reference in New Issue
Block a user