From 06e93f8d9508a23e86751dfae2f6a7e550d8e1af Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 24 Mar 2012 11:10:28 +0200 Subject: Add sound.dig --- src/game.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index 9715c6676..1dcda043e 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2250,10 +2250,18 @@ void the_game( params = getDigParams(nodedef->get(n).groups, tp); } - 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; + 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; -- cgit v1.2.3