From: paramat <paramat@users.noreply.github.com>
Date: Tue, 19 Sep 2017 15:39:30 +0000 (+0100)
Subject: CAO footstep sounds: Reduce gain to balance volume
X-Git-Tag: 5.0.0~793
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee0bfbede1f5eb17e76cd00444ea9749869d9adb;p=oweals%2Fminetest.git

CAO footstep sounds: Reduce gain to balance volume
---

diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 9a493daff..7178debaa 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -862,16 +862,17 @@ void GenericCAO::step(float dtime, ClientEnvironment *env)
 
 		float moved = lastpos.getDistanceFrom(pos_translator.vect_show);
 		m_step_distance_counter += moved;
-		if(m_step_distance_counter > 1.5*BS)
-		{
-			m_step_distance_counter = 0;
-			if(!m_is_local_player && m_prop.makes_footstep_sound)
-			{
+		if (m_step_distance_counter > 1.5f * BS) {
+			m_step_distance_counter = 0.0f;
+			if (!m_is_local_player && m_prop.makes_footstep_sound) {
 				INodeDefManager *ndef = m_client->ndef();
-				v3s16 p = floatToInt(getPosition() + v3f(0,
-						(m_prop.collisionbox.MinEdge.Y-0.5)*BS, 0), BS);
+				v3s16 p = floatToInt(getPosition() +
+					v3f(0.0f, (m_prop.collisionbox.MinEdge.Y - 0.5f) * BS, 0.0f), BS);
 				MapNode n = m_env->getMap().getNodeNoEx(p);
 				SimpleSoundSpec spec = ndef->get(n).sound_footstep;
+				// Reduce footstep gain, as non-local-player footsteps are
+				// somehow louder.
+				spec.gain *= 0.6f;
 				m_client->sound()->playSoundAt(spec, false, getPosition());
 			}
 		}