diff --git a/data/sound/voice_coffee.wav b/data/sound/voice_coffee.wav new file mode 100644 index 0000000..97eb47f Binary files /dev/null and b/data/sound/voice_coffee.wav differ diff --git a/data/sound/voice_no.wav b/data/sound/voice_no.wav new file mode 100644 index 0000000..2bd8157 Binary files /dev/null and b/data/sound/voice_no.wav differ diff --git a/data/sound/voice_power_up.wav b/data/sound/voice_power_up.wav new file mode 100644 index 0000000..9b68270 Binary files /dev/null and b/data/sound/voice_power_up.wav differ diff --git a/source/director.cpp b/source/director.cpp index 8e83e35..da0c473 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -398,6 +398,9 @@ void Director::setFileList() 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/voice_power_up.wav", AssetType::SOUND); + Asset::get()->add(prefix + "/data/sound/voice_no.wav", AssetType::SOUND); // Shaders Asset::get()->add(prefix + "/data/shaders/crtpi_256.glsl", AssetType::DATA); diff --git a/source/game.cpp b/source/game.cpp index bf20904..4034712 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -474,6 +474,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr &player) (item->getWidth() - game_text_textures_[4]->getWidth()) / 2; createItemText(x, game_text_textures_[4]); } + JA_PlaySound(Resource::get()->getSound("voice_coffee.wav")); break; } case ItemType::COFFEE_MACHINE: @@ -484,6 +485,7 @@ void Game::checkPlayerItemCollision(std::shared_ptr &player) item->getPosX() + (item->getWidth() - game_text_textures_[3]->getWidth()) / 2; createItemText(x, game_text_textures_[3]); + JA_PlaySound(Resource::get()->getSound("voice_power_up.wav")); break; } default: @@ -819,7 +821,7 @@ void Game::killPlayer(std::shared_ptr &player) balloon_manager_->stopAllBalloons(); JA_PlaySound(Resource::get()->getSound("player_collision.wav")); screen_->shake(); - JA_PlaySound(Resource::get()->getSound("coffeeout.wav")); + JA_PlaySound(Resource::get()->getSound("voice_no.wav")); player->setPlayingState(PlayerState::DYING); allPlayersAreNotPlaying() ? stopMusic() : resumeMusic(); } diff --git a/source/player.cpp b/source/player.cpp index 6244c24..05cb952 100644 --- a/source/player.cpp +++ b/source/player.cpp @@ -8,6 +8,8 @@ #include "param.h" // Para Param, ParamGame, param #include "scoreboard.h" // Para Scoreboard, ScoreboardMode #include "texture.h" // Para Texture +#include "resource.h" +#include "jail_audio.h" // Constructor Player::Player(int id, float x, int y, bool demo, SDL_Rect &play_area, std::vector> texture, const std::vector> &animations) @@ -175,6 +177,7 @@ void Player::move() if ((player_sprite_->getPosX() < play_area_.x) || (player_sprite_->getPosX() + WIDTH_ > play_area_.w)) { player_sprite_->setVelX(-player_sprite_->getVelX()); + JA_PlaySound(Resource::get()->getSound("bubble4.wav")); } // Si el cadaver toca el suelo cambia el estado @@ -188,6 +191,7 @@ void Player::move() pos_y_ = default_pos_y_; player_sprite_->clear(); shiftSprite(); + JA_PlaySound(Resource::get()->getSound("bubble4.wav")); } else { @@ -195,6 +199,7 @@ 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")); } } break;