From a3b3fafe27c3de07a3c4634a9513914e01dc2de4 Mon Sep 17 00:00:00 2001 From: auria Date: Sun, 15 May 2011 18:44:42 +0000 Subject: [PATCH] More sound tweaks in multiplayer git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8592 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/items/powerup.cpp | 5 +---- src/karts/kart.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/items/powerup.cpp b/src/items/powerup.cpp index a8437dbd7..257b19c3d 100644 --- a/src/items/powerup.cpp +++ b/src/items/powerup.cpp @@ -232,9 +232,6 @@ void Powerup::use() // so the sounds of all AIs are constantly heard. So reduce volume of sounds. if (race_manager->getNumLocalPlayers() > 1) { - const int np = race_manager->getNumLocalPlayers(); - const int nai = race_manager->getNumberOfKarts() - np; - // player karts played at full volume; AI karts much dimmer if (m_owner->getController()->isPlayerController()) @@ -243,7 +240,7 @@ void Powerup::use() } else { - m_sound_use->volume( 1.0f / nai ); + m_sound_use->volume( std::min(0.5f, 1.0f / race_manager->getNumberOfKarts()) ); } } diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp index c48378e9f..81d8751da 100644 --- a/src/karts/kart.cpp +++ b/src/karts/kart.cpp @@ -144,10 +144,12 @@ Kart::Kart (const std::string& ident, Track* track, int position, bool is_first_ { if (type == RaceManager::KT_PLAYER) { - m_goo_sound->volume( 1.0f / race_manager->getNumLocalPlayers() ); - m_skid_sound->volume( 1.0f / race_manager->getNumLocalPlayers() ); - m_crash_sound->volume( 1.0f / race_manager->getNumLocalPlayers() ); - m_beep_sound->volume( 1.0f / race_manager->getNumLocalPlayers() ); + // players have louder sounds than AIs + const float factor = std::min(1.0f, race_manager->getNumLocalPlayers()/2.0f); + m_goo_sound->volume( 1.0f / factor ); + m_skid_sound->volume( 1.0f / factor ); + m_crash_sound->volume( 1.0f / factor ); + m_beep_sound->volume( 1.0f / factor ); } else {