Modificada la seqëncia d'inici per a que la musica començe antes

So aleatori en els rebots del jugador al morir

source/credits.cpp

@@ -24,7 +24,7 @@
 #include "lang.h"
 
 // Textos
-constexpr const char TEXT_COPYRIGHT[] = "@2020,2024 JailDesigner";
+constexpr const char TEXT_COPYRIGHT[] = "@2020,2025 JailDesigner";
 
 // Constructor
 Credits::Credits()

source/director.cpp

@@ -388,29 +388,31 @@ void Director::setFileList()
 	Asset::get()->add(prefix + "/data/music/credits.ogg", AssetType::MUSIC);
 
 	// Sonidos
-	Asset::get()->add(prefix + "/data/sound/game_start.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/balloon.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/bubble1.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/bubble2.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/bubble3.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/bubble4.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/bullet.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/clock.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/coffeeout.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/continue_clock.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/game_start.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/hiscore.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/itemdrop.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/itempickup.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/player_collision.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/stage_change.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/clock.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/powerball.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/notify.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/logo.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/voice_coffee.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/notify.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/player_collision.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/powerball.wav", AssetType::SOUND);
-	Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/stage_change.wav", AssetType::SOUND);
 	Asset::get()->add(prefix + "/data/sound/tabe.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/title.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/voice_coffee.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/voice_get_ready.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/voice_power_up.wav", AssetType::SOUND);
+	Asset::get()->add(prefix + "/data/sound/walk.wav", AssetType::SOUND);
 
 	// Shaders
 	Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA);

source/fade.cpp

@@ -151,7 +151,7 @@ void Fade::update()
 
 		case FadeType::VENETIAN:
 		{
-			// Counter debe ir de 0 a 150
+			// Counter debe ir de 0 a 150 <-- comprobar si esto es aún cierto
 			if (square_.back().h < param.fade.venetian_size)
 			{
 				// Dibuja sobre el backbuffer_
@@ -176,6 +176,16 @@ void Fade::update()
 					// A partir del segundo rectangulo se pinta en función del anterior
 					square_.at(i).h = i == 0 ? h : std::max(square_.at(i - 1).h - 2, 0);
 				}
+
+				int completed = 0;
+				for (const auto &square : square_)
+				{
+					if (square.h >= param.fade.venetian_size)
+					{
+						++completed;
+					}
+				}
+				value_ = calculateValue(0, square_.size() - 1, completed);
 			}
 			else
 			{
@@ -315,9 +325,9 @@ void Fade::cleanBackbuffer(Uint8 r, Uint8 g, Uint8 b, Uint8 a)
 // Calcula el valor del estado del fade
 int Fade::calculateValue(int min, int max, int current)
 {
-	if (max == 0)
+	if (current < min)
-	{
 		return 0;
-	}
+	if (current > max)
-	return std::clamp(current * 100 / max, 0, 100);
+		return 100;
+	return static_cast<int>(100.0 * (current - min) / (max - min));
 }

source/game.cpp

@@ -35,6 +35,7 @@
 #include "tabe.h"				  // Para Tabe
 #include "text.h"				  // Para Text
 #include "texture.h"			  // Para Texture
+#include <iostream>
 struct JA_Sound_t; // lines 37-37
 
 // Constructor
@@ -285,32 +286,23 @@ void Game::updateStage()
 	}
 }
 
-// Actualiza el estado de fade in
-void Game::updateFadeInState()
-{
-	if (state_ == GameState::FADE_IN)
-	{
-		if (fade_in_->hasEnded())
-		{
-			state_ = GameState::PLAYING;
-
-			// Crea los primeros globos y el mensaje de inicio
-			if (!demo_.enabled)
-			{
-				balloon_manager_->createTwoBigBalloons();
-				evaluateAndSetMenace();
-				createMessage({paths_.at(0), paths_.at(1)}, Resource::get()->getTexture("game_text_get_ready"));
-				JA_PlaySound(Resource::get()->getSound("voice_get_ready.wav"));
-			}
-		}
-	}
-}
-
 // Actualiza el estado de fin de la partida
-void Game::updateGameOverState()
+void Game::updateGameStateGameOver()
-{
-	if (state_ == GameState::GAME_OVER)
 {
+	fade_out_->update();
+	updatePlayers();
+	updateScoreboard();
+	updateBackground();
+	balloon_manager_->update();
+	tabe_->update();
+	updateBullets();
+	updateItems();
+	updateSmartSprites();
+	updatePathSprites();
+	updateTimeStopped();
+	checkBulletBalloonCollision();
+	cleanVectors();
+
 	if (game_over_counter_ > 0)
 	{
 		if (game_over_counter_ == GAME_OVER_COUNTER_)
@@ -328,6 +320,12 @@ void Game::updateGameOverState()
 		}
 	}
 
+	if (fade_out_->isEnabled())
+	{
+		const float vol = static_cast<float>(64 * (100 - fade_out_->getValue())) / 100.0f;
+		JA_SetSoundVolume(to_JA_volume(static_cast<int>(vol)));
+	}
+
 	if (fade_out_->hasEnded())
 	{
 		if (game_completed_counter_ > 0)
@@ -340,15 +338,25 @@ void Game::updateGameOverState()
 			// La partida ha terminado con la derrota de los jugadores
 			section::name = section::Name::HI_SCORE_TABLE;
 		}
-		}
+		JA_StopChannel(-1);
+		JA_SetSoundVolume(to_JA_volume(options.audio.sound.volume));
 	}
 }
 
 // Gestiona eventos para el estado del final del juego
-void Game::updateCompletedState()
+void Game::updateGameStateCompleted()
-{
-	if (state_ == GameState::COMPLETED)
 {
+	updatePlayers();
+	updateScoreboard();
+	updateBackground();
+	balloon_manager_->update();
+	tabe_->update();
+	updateBullets();
+	updateItems();
+	updateSmartSprites();
+	updatePathSprites();
+	cleanVectors();
+
 	// Para la música y elimina todos los globos e items
 	if (game_completed_counter_ == 0)
 	{
@@ -384,16 +392,23 @@ void Game::updateCompletedState()
 	if (game_completed_counter_ == 500)
 	{
 		for (auto &player : players_)
+		{
 			if (player->isCelebrating())
 			{
 				player->setPlayingState(player->IsEligibleForHighScore() ? PlayerState::ENTERING_NAME_GAME_COMPLETED : PlayerState::LEAVING_SCREEN);
 			}
 		}
+	}
+
+	// Si los jugadores ya no estan y no quedan mensajes en pantalla
+	if (allPlayersAreGameOver() && path_sprites_.size() == 0)
+	{
+		state_ = GameState::GAME_OVER;
+	}
 
 	// Incrementa el contador al final
 	++game_completed_counter_;
 }
-}
 
 // Comprueba el estado del juego
 void Game::checkState()
@@ -583,12 +598,16 @@ void Game::checkBulletBalloonCollision()
 }
 
 // Mueve las balas activas
-void Game::moveBullets()
+void Game::updateBullets()
 {
 	for (auto &bullet : bullets_)
+	{
 		if (bullet->move() == BulletMoveStatus::OUT)
+		{
 			getPlayer(bullet->getOwner())->decScoreMultiplier();
 		}
+	}
+}
 
 // Pinta las balas activas
 void Game::renderBullets()
@@ -802,29 +821,37 @@ void Game::throwCoffee(int x, int y)
 void Game::updateSmartSprites()
 {
 	for (auto &sprite : smart_sprites_)
+	{
 		sprite->update();
 	}
+}
 
 // Pinta los SmartSprites activos
 void Game::renderSmartSprites()
 {
 	for (auto &sprite : smart_sprites_)
+	{
 		sprite->render();
 	}
+}
 
 // Actualiza los PathSprites
 void Game::updatePathSprites()
 {
 	for (auto &sprite : path_sprites_)
+	{
 		sprite->update();
 	}
+}
 
 // Pinta los PathSprites activos
 void Game::renderPathSprites()
 {
 	for (auto &sprite : path_sprites_)
+	{
 		sprite->render();
 	}
+}
 
 // Acciones a realizar cuando el jugador muere
 void Game::killPlayer(std::shared_ptr<Player> &player)
@@ -895,7 +922,33 @@ void Game::update()
 #ifdef RECORDING
 		updateRecording();
 #endif
-		updateGame();
+		if (!paused_)
+		{
+			switch (state_)
+			{
+			case GameState::COMPLETED:
+				updateGameStateCompleted();
+				break;
+			case GameState::GAME_OVER:
+				updateGameStateGameOver();
+				break;
+			case GameState::PLAYING:
+				updateGameStatePlaying();
+				break;
+			case GameState::FADE_IN:
+				updateGameStateFadeIn();
+				break;
+			case GameState::ENTERING_PLAYER:
+				updateGameStateEnteringPlayer();
+				break;
+			case GameState::SHOWING_GET_READY_MESSAGE:
+				updateGameStateShowingGetReadyMessage();
+				break;
+
+			default:
+				break;
+			}
+		}
 
 		checkMusicStatus();
 		screen_->update();
@@ -991,7 +1044,7 @@ void Game::disableTimeStopItem()
 void Game::checkMusicStatus()
 {
 	// Si se ha completado el juego o los jugadores han terminado, detiene la música
-	if (state_ != GameState::COMPLETED && !allPlayersAreGameOver())
+	if (state_ == GameState::PLAYING || state_ == GameState::SHOWING_GET_READY_MESSAGE)
 	{
 		playMusic();
 	}
@@ -1194,7 +1247,7 @@ void Game::checkEvents()
 			}
 			case SDLK_6: // Crea un mensaje
 			{
-				createMessage({paths_.at(2), paths_.at(3)}, Resource::get()->getTexture("game_text_congratulations"));
+				createMessage({paths_.at(0), paths_.at(1)}, Resource::get()->getTexture("game_text_get_ready"));
 				break;
 			}
 			case SDLK_7: // Flash
@@ -1705,7 +1758,7 @@ void Game::initPlayers(int player_id)
 
 	// Activa el jugador que coincide con el "player_id"
 	auto player = getPlayer(player_id);
-	player->setPlayingState(PlayerState::PLAYING);
+	player->setPlayingState(PlayerState::ENTERING_SCREEN);
 	player->setInvulnerable(false);
 }
 
@@ -1791,31 +1844,76 @@ void Game::updateRecording()
 }
 #endif
 
-// Actualiza las variables durante el transcurso normal del juego
+// Actualiza variables durande dicho estado
-void Game::updateGame()
+void Game::updateGameStateFadeIn()
 {
-	if (!paused_)
+	fade_in_->update();
+	updateScoreboard();
+	updateBackground();
+	if (fade_in_->hasEnded())
+	{
+		state_ = GameState::ENTERING_PLAYER;
+		balloon_manager_->createTwoBigBalloons();
+		evaluateAndSetMenace();
+	}
+}
+
+// Actualiza variables durande dicho estado
+void Game::updateGameStateEnteringPlayer()
+{
+	balloon_manager_->update();
+	updatePlayers();
+	updateScoreboard();
+	updateBackground();
+	for (auto player : players_)
+	{
+		if (player->isPlaying())
+		{
+			state_ = GameState::SHOWING_GET_READY_MESSAGE;
+			createMessage({paths_.at(0), paths_.at(1)}, Resource::get()->getTexture("game_text_get_ready"));
+			//JA_PlaySound(Resource::get()->getSound("voice_get_ready.wav"));
+		}
+	}
+}
+
+// Actualiza variables durande dicho estado
+void Game::updateGameStateShowingGetReadyMessage()
+{
+	balloon_manager_->update();
+	updatePathSprites();
+	updatePlayers();
+	updateBullets();
+	updateScoreboard();
+	updateBackground();
+	freePathSprites();
+	if (path_sprites_.size() == 0)
+	{
+		state_ = GameState::PLAYING;
+	}
+	else
+	{
+		path_sprites_.front()->getCurrentPath()
+	}
+}
+
+// Actualiza las variables durante el transcurso normal del juego
+void Game::updateGameStatePlaying()
 {
 #ifdef DEBUG
-		if (auto_pop_balloons_ && state_ == GameState::PLAYING)
+	if (auto_pop_balloons_)
 	{
-			Stage::addPower(5);
+		Stage::addPower(20);
 	}
 #endif
-		fade_in_->update();
-		fade_out_->update();
 	updatePlayers();
 	checkPlayersStatusPlaying();
 	updateScoreboard();
 	updateBackground();
 	balloon_manager_->update();
 	tabe_->update();
-		moveBullets();
+	updateBullets();
 	updateItems();
 	updateStage();
-		updateFadeInState();
-		updateGameOverState();
-		updateCompletedState();
 	updateSmartSprites();
 	updatePathSprites();
 	updateTimeStopped();
@@ -1826,7 +1924,6 @@ void Game::updateGame()
 	checkState();
 	cleanVectors();
 }
-}
 
 // Vacía los vectores de elementos deshabilitados
 void Game::cleanVectors()

source/game.h

@@ -67,6 +67,8 @@ private:
 	enum class GameState
 	{
 		FADE_IN,
+		ENTERING_PLAYER,
+		SHOWING_GET_READY_MESSAGE,
 		PLAYING,
 		COMPLETED,
 		GAME_OVER,
@@ -197,11 +199,8 @@ private:
 	// Comprueba si hay cambio de fase y actualiza las variables
 	void updateStage();
 
-	// Actualiza el estado de fade in
-	void updateFadeInState();
-
 	// Actualiza el estado de fin de la partida
-	void updateGameOverState();
+	void updateGameStateGameOver();
 
 	// Destruye todos los items
 	void destroyAllItems();
@@ -216,7 +215,7 @@ private:
 	void checkBulletBalloonCollision();
 
 	// Mueve las balas activas
-	void moveBullets();
+	void updateBullets();
 
 	// Pinta las balas activas
 	void renderBullets();
@@ -392,11 +391,20 @@ private:
 	// Actualiza las variables durante el modo de grabación
 	void updateRecording();
 #endif
+	// Actualiza variables durande dicho estado
+	void updateGameStateFadeIn();
+
+	// Actualiza variables durande dicho estado
+	void updateGameStateEnteringPlayer();
+
+	// Actualiza variables durande dicho estado
+	void updateGameStateShowingGetReadyMessage();
+
 	// Actualiza las variables durante el transcurso normal del juego
-	void updateGame();
+	void updateGameStatePlaying();
 
 	// Gestiona eventos para el estado del final del juego
-	void updateCompletedState();
+	void updateGameStateCompleted();
 
 	// Comprueba el estado del juego
 	void checkState();

source/input.cpp

@@ -245,7 +245,15 @@ bool Input::discoverGameControllers()
 	}
 
 	std::cout << "\n** LOOKING FOR GAME CONTROLLERS" << std::endl;
+	if (num_joysticks_ != num_gamepads_)
+	{
+		std::cout << "Joysticks found: " << num_joysticks_ << std::endl;
 		std::cout << "Gamepads found : " << num_gamepads_ << std::endl;
+	}
+	else
+	{
+		std::cout << "Gamepads found: " << num_gamepads_ << std::endl;
+	}
 
 	if (num_gamepads_ > 0)
 	{

source/jail_audio.cpp

@@ -96,24 +96,12 @@ void audioCallback(void * userdata, uint8_t * stream, int len) {
 
 void JA_Init(const int freq, const SDL_AudioFormat format, const int channels)
 {
-    #ifdef DEBUG
-    SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
-    #endif
-    
-    SDL_Log("Iniciant JailAudio...");
     JA_freq = freq;
     JA_format = format;
     JA_channels = channels;
     SDL_AudioSpec audioSpec{JA_freq, JA_format, JA_channels, 0, 1024, 0, 0, audioCallback, NULL};
     if (sdlAudioDevice != 0) SDL_CloseAudioDevice(sdlAudioDevice);
     sdlAudioDevice = SDL_OpenAudioDevice(NULL, 0, &audioSpec, NULL, 0);
-    if (sdlAudioDevice==0)
-    {
-        SDL_Log("FAILED!\n");
-        SDL_Log("Failed to initialize SDL audio!\n");
-    } else {
-        SDL_Log("OK!\n");
-    }
     SDL_PauseAudioDevice(sdlAudioDevice, 0);
 }
 
@@ -134,7 +122,6 @@ JA_Music_t *JA_LoadMusic(Uint8* buffer, Uint32 length)
 
     SDL_AudioCVT cvt;
     SDL_BuildAudioCVT(&cvt, AUDIO_S16, chan, samplerate, JA_format, JA_channels, JA_freq);
-    SDL_Log("Music length: %f\n", float(music->samples)/float(JA_freq));
     if (cvt.needed) {
         cvt.len = music->samples * chan * 2;
         music->length = cvt.len;

source/path_sprite.cpp

@@ -95,7 +95,17 @@ void PathSprite::addPath(std::vector<SDL_Point> spots, int waiting_counter)
 // Habilita el objeto
 void PathSprite::enable()
 {
+	if (paths_.size() == 0)
+	{
+		return;
+	}
+
 	enabled_ = true;
+	
+	// Establece la posición
+	auto &path = paths_.at(current_path_);
+	const auto &p = path.spots.at(path.counter);
+	setPosition(p);
 }
 
 // Coloca el sprite en los diferentes puntos del recorrido

source/path_sprite.h

@@ -73,4 +73,7 @@ public:
 
 	// Indica si ha terminado todos los recorridos
 	bool hasFinished();
+
+	// Getters
+	int getCurrentPath() const { return current_path_; }
 };

source/player.cpp

@@ -40,7 +40,7 @@ void Player::init()
 	pos_y_ = default_pos_y_;
 	walking_state_ = PlayerState::WALKING_STOP;
 	firing_state_ = PlayerState::FIRING_NONE;
-	playing_state_ = PlayerState::WAITING;
+	setPlayingState(PlayerState::WAITING);
 	invulnerable_ = true;
 	invulnerable_counter_ = INVULNERABLE_COUNTER_;
 	power_up_ = false;
@@ -174,10 +174,14 @@ void Player::move()
 	case PlayerState::DYING:
 	{
 		// Si el cadaver abandona el area de juego por los laterales lo hace rebotar
-		if ((player_sprite_->getPosX() < play_area_.x) || (player_sprite_->getPosX() + WIDTH_ > play_area_.w))
+		const int x = player_sprite_->getPosX();
+		const int min_x = play_area_.x;
+		const int max_x = play_area_.x + play_area_.w - WIDTH_;
+		if ((x < min_x) || (x > max_x))
 		{
+			player_sprite_->setPosX(std::clamp(x, min_x, max_x));
 			player_sprite_->setVelX(-player_sprite_->getVelX());
-			JA_PlaySound(Resource::get()->getSound("bubble4.wav"));
+			playRandomBubbleSound();
 		}
 
 		// Si el cadaver toca el suelo cambia el estado
@@ -191,7 +195,7 @@ void Player::move()
 				pos_y_ = default_pos_y_;
 				player_sprite_->clear();
 				shiftSprite();
-				JA_PlaySound(Resource::get()->getSound("bubble4.wav"));
+				playRandomBubbleSound();
 			}
 			else
 			{
@@ -199,13 +203,19 @@ void Player::move()
 				player_sprite_->setPosY(play_area_.h - HEIGHT_);
 				player_sprite_->setVelY(player_sprite_->getVelY() * -0.5f);
 				player_sprite_->setVelX(player_sprite_->getVelX() * 0.75f);
-				JA_PlaySound(Resource::get()->getSound("bubble4.wav"));
+				playRandomBubbleSound();
 			}
 		}
 		break;
 	}
 	case PlayerState::LEAVING_SCREEN:
 	{
+		++step_counter_;
+		if (step_counter_ % 10 == 0)
+		{
+			JA_PlaySound(Resource::get()->getSound("walk.wav"));
+		}
+
 		switch (id_)
 		{
 		case 1:
@@ -224,7 +234,45 @@ void Player::move()
 		shiftSprite();
 
 		if (pos_x_ == min_x || pos_x_ == max_x)
+		{
 			setPlayingState(PlayerState::GAME_OVER);
+		}
+		break;
+	}
+	case PlayerState::ENTERING_SCREEN:
+	{
+		++step_counter_;
+		if (step_counter_ % 10 == 0)
+		{
+			JA_PlaySound(Resource::get()->getSound("walk.wav"));
+		}
+
+		switch (id_)
+		{
+		case 1:
+			setInputPlaying(InputType::RIGHT);
+			pos_x_ += vel_x_;
+			if (pos_x_ > default_pos_x_)
+			{
+				pos_x_ = default_pos_x_;
+				setPlayingState(PlayerState::PLAYING);
+				setInvulnerable(false);
+			}
+			break;
+		case 2:
+			setInputPlaying(InputType::LEFT);
+			pos_x_ += vel_x_;
+			if (pos_x_ < default_pos_x_)
+			{
+				pos_x_ = default_pos_x_;
+				setPlayingState(PlayerState::PLAYING);
+				setInvulnerable(false);
+			}
+			break;
+		default:
+			break;
+		}
+		shiftSprite();
 		break;
 	}
 	case PlayerState::CREDITS:
@@ -291,6 +339,7 @@ void Player::setAnimation()
 	{
 	case PlayerState::PLAYING:
 	case PlayerState::ENTERING_NAME_GAME_COMPLETED:
+	case PlayerState::ENTERING_SCREEN:
 	case PlayerState::LEAVING_SCREEN:
 	case PlayerState::CREDITS:
 	{
@@ -506,9 +555,29 @@ void Player::setPlayingState(PlayerState state)
 	}
 	case PlayerState::LEAVING_SCREEN:
 	{
+		step_counter_ = 0;
 		setScoreboardMode(ScoreboardMode::GAME_COMPLETED);
 		break;
 	}
+	case PlayerState::ENTERING_SCREEN:
+	{
+		step_counter_ = 0;
+		setScoreboardMode(ScoreboardMode::SCORE);
+		switch (id_)
+		{
+		case 1:
+			pos_x_ = param.game.game_area.rect.x - WIDTH_;
+			break;
+
+		case 2:
+			pos_x_ = param.game.game_area.rect.x + param.game.game_area.rect.w;
+			break;
+
+		default:
+			break;
+		}
+		break;
+	}
 	case PlayerState::CREDITS:
 	{
 		vel_x_ = (walking_state_ == PlayerState::WALKING_RIGHT) ? BASE_SPEED_ : -BASE_SPEED_;
@@ -648,6 +717,10 @@ void Player::decContinueCounter()
 	{
 		setPlayingState(PlayerState::GAME_OVER);
 	}
+	else
+	{
+		JA_PlaySound(Resource::get()->getSound("continue_clock.wav"));
+	}
 }
 
 // Decrementa el contador de entrar nombre
@@ -687,3 +760,10 @@ void Player::shiftSprite()
 	player_sprite_->setPosY(pos_y_);
 	power_sprite_->setPosX(getPosX() - power_up_desp_x_);
 }
+
+// Hace sonar un ruido al azar
+void Player::playRandomBubbleSound()
+{
+	const std::vector<std::string> sounds = {"bubble1.wav", "bubble2.wav", "bubble3.wav", "bubble4.wav"};
+	JA_PlaySound(Resource::get()->getSound(sounds.at(rand() % sounds.size())));
+}

source/player.h

@@ -40,6 +40,7 @@ enum class PlayerState
 	CELEBRATING,				  // Poniendo pose de victoria
 	ENTERING_NAME_GAME_COMPLETED, // Poniendo nombre en el tramo final del juego
 	LEAVING_SCREEN,				  // Moviendose fuera de la pantalla
+	ENTERING_SCREEN,			  // Entando a la pantalla
 	CREDITS,					  // Estado para los creditos del juego
 };
 
@@ -91,6 +92,7 @@ private:
 	bool demo_;												// Para que el jugador sepa si está en el modo demostración
 	int enter_name_counter_;								// Contador para poner nombre
 	Uint32 enter_name_ticks_ = 0;							// Variable para poder cambiar el contador de poner nombre en función del tiempo
+	int step_counter_ = 0;									// Cuenta los pasos para los estados en los que camina automáticamente
 
 	// Actualiza el circulo de colisión a la posición del jugador
 	void shiftColliders();
@@ -116,6 +118,10 @@ private:
 	// Cambia el modo del marcador
 	void setScoreboardMode(ScoreboardMode mode);
 
+	// Hace sonar un ruido al azar
+	void playRandomBubbleSound();
+
+	// Getters
 	bool isRenderable() const { return !isWaiting() && !isGameOver(); }
 
 public:

source/title.h

@@ -15,7 +15,7 @@ namespace section
 }
 
 // Textos
-constexpr const char TEXT_COPYRIGHT[] = "@2020,2024 JailDesigner";
+constexpr const char TEXT_COPYRIGHT[] = "@2020,2025 JailDesigner";
 
 // Parámetros
 constexpr bool ALLOW_TITLE_ANIMATION_SKIP = false;