From c8bd2ae11cb0972eda86577ab15c2c69ecae33d0 Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Tue, 9 Jul 2013 02:38:53 +0200 Subject: [PATCH] Dont play digging sound if not digging --- src/game.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/game.cpp b/src/game.cpp index 0ae323208..ff694d12e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2612,20 +2612,6 @@ void the_game( if(tp) params = getDigParams(nodedef->get(n).groups, tp); } - - SimpleSoundSpec sound_dig = nodedef->get(n).sound_dig; - if(sound_dig.exists()){ - if(sound_dig.name == "__group"){ - if(params.main_group != ""){ - soundmaker.m_player_leftpunch_sound.gain = 0.5; - soundmaker.m_player_leftpunch_sound.name = - std::string("default_dig_") + - params.main_group; - } - } else{ - soundmaker.m_player_leftpunch_sound = sound_dig; - } - } float dig_time_complete = 0.0; @@ -2658,6 +2644,20 @@ void the_game( dig_index = crack_animation_length; } + SimpleSoundSpec sound_dig = nodedef->get(n).sound_dig; + if(sound_dig.exists() && params.diggable){ + if(sound_dig.name == "__group"){ + if(params.main_group != ""){ + soundmaker.m_player_leftpunch_sound.gain = 0.5; + soundmaker.m_player_leftpunch_sound.name = + std::string("default_dig_") + + params.main_group; + } + } else{ + soundmaker.m_player_leftpunch_sound = sound_dig; + } + } + // Don't show cracks if not diggable if(dig_time_complete >= 100000.0) {