diff --git a/data/sounds/effects/explosion.wav b/data/sounds/effects/enemy_explosion.wav similarity index 100% rename from data/sounds/effects/explosion.wav rename to data/sounds/effects/enemy_explosion.wav diff --git a/data/sounds/effects/explosion2.wav b/data/sounds/effects/player_explosion.wav similarity index 100% rename from data/sounds/effects/explosion2.wav rename to data/sounds/effects/player_explosion.wav diff --git a/source/core/defaults/audio.hpp b/source/core/defaults/audio.hpp index 84ea984..ecc7f71 100644 --- a/source/core/defaults/audio.hpp +++ b/source/core/defaults/audio.hpp @@ -35,8 +35,8 @@ namespace Defaults::Music { namespace Defaults::Sound { constexpr const char* CONTINUE = "effects/continue.wav"; // Cuenta atras - constexpr const char* EXPLOSION = "effects/explosion.wav"; // Explosión - constexpr const char* EXPLOSION2 = "effects/explosion2.wav"; // Explosión alternativa + constexpr const char* ENEMY_EXPLOSION = "effects/enemy_explosion.wav"; // Explosió d'enemic (debris default) + constexpr const char* PLAYER_EXPLOSION = "effects/player_explosion.wav"; // Explosió de la nau del jugador constexpr const char* FRIENDLY_FIRE_HIT = "effects/friendly_fire.wav"; // Friendly fire hit constexpr const char* HIT = "effects/hit.wav"; // Enemic ferit (primer impacte → HURT) constexpr const char* HURT = "effects/hurt.wav"; // Nau pròpia entra a HURT diff --git a/source/game/effects/debris_manager.hpp b/source/game/effects/debris_manager.hpp index 4a64be1..ec56584 100644 --- a/source/game/effects/debris_manager.hpp +++ b/source/game/effects/debris_manager.hpp @@ -64,7 +64,7 @@ namespace Effects { const Vec2& velocitat_objecte = {.x = 0.0F, .y = 0.0F}, float velocitat_angular = 0.0F, float factor_herencia_visual = 0.0F, - const std::string& sound = Defaults::Sound::EXPLOSION, + const std::string& sound = Defaults::Sound::ENEMY_EXPLOSION, SDL_Color color = {0, 0, 0, 0}, // alpha==0 → fragmentos usan oscilador global float lifetime = Defaults::Physics::Debris::TEMPS_VIDA, float friction = Defaults::Physics::Debris::ACCELERACIO, diff --git a/source/game/scenes/game_scene.cpp b/source/game/scenes/game_scene.cpp index dc1dbc2..5a61d40 100644 --- a/source/game/scenes/game_scene.cpp +++ b/source/game/scenes/game_scene.cpp @@ -801,7 +801,7 @@ void GameScene::tocado(uint8_t player_id, const Vec2& bullet_velocity) { INHERITED_VEL, 0.0F, // sense herència angular 0.0F, // sin herencia visual - Defaults::Sound::EXPLOSION2, + Defaults::Sound::PLAYER_EXPLOSION, ships_[player_id].getConfig().colors.normal, Defaults::Physics::Debris::ENEMY_LIFETIME, Defaults::Physics::Debris::ENEMY_FRICTION, diff --git a/source/game/systems/enemy_event_dispatcher.cpp b/source/game/systems/enemy_event_dispatcher.cpp index e4f6ec2..2a19957 100644 --- a/source/game/systems/enemy_event_dispatcher.cpp +++ b/source/game/systems/enemy_event_dispatcher.cpp @@ -48,7 +48,7 @@ namespace Systems::EnemyEvents { INHERITED_VEL, 0.0F, 0.0F, - Defaults::Sound::EXPLOSION, + Defaults::Sound::ENEMY_EXPLOSION, color, Defaults::Physics::Debris::ENEMY_LIFETIME, Defaults::Physics::Debris::ENEMY_FRICTION,