summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-24 11:10:28 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-24 11:10:28 +0200
commit06e93f8d9508a23e86751dfae2f6a7e550d8e1af (patch)
tree3e3a9a0dc78ee6c216b047304b53bfe1d3d3ce0e /src/game.cpp
parent74780134f2825427bb0db3b370642d3512af5ecd (diff)
downloadminetest-06e93f8d9508a23e86751dfae2f6a7e550d8e1af.tar.gz
minetest-06e93f8d9508a23e86751dfae2f6a7e550d8e1af.tar.bz2
minetest-06e93f8d9508a23e86751dfae2f6a7e550d8e1af.zip
Add sound.dig
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp16
1 files changed, 12 insertions, 4 deletions
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;