Skip to content

Commit

Permalink
Convert sound_play uses in builtin to ephemeral
Browse files Browse the repository at this point in the history
  • Loading branch information
sfan5 committed Feb 1, 2020
1 parent c10e188 commit 7d29611
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
6 changes: 3 additions & 3 deletions builtin/game/falling.lua
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ core.register_entity(":__builtin:falling_node", {
meta:from_table(self.meta)
end
if def.sounds and def.sounds.place then
core.sound_play(def.sounds.place, {pos = np})
core.sound_play(def.sounds.place, {pos = np}, true)
end
end
self.object:remove()
Expand All @@ -154,7 +154,7 @@ local function convert_to_falling_node(pos, node)

local def = core.registered_nodes[node.name]
if def and def.sounds and def.sounds.fall then
core.sound_play(def.sounds.fall, {pos = pos})
core.sound_play(def.sounds.fall, {pos = pos}, true)
end

obj:get_luaentity():set_node(node, metatable)
Expand Down Expand Up @@ -187,7 +187,7 @@ local function drop_attached_node(p)
def.preserve_metadata(pos_copy, node_copy, oldmeta, drops)
end
if def and def.sounds and def.sounds.fall then
core.sound_play(def.sounds.fall, {pos = p})
core.sound_play(def.sounds.fall, {pos = p}, true)
end
core.remove_node(p)
for _, item in pairs(drops) do
Expand Down
10 changes: 8 additions & 2 deletions builtin/game/item.lua
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,10 @@ function core.do_item_eat(hp_change, replace_with_item, itemstack, user, pointed
user:set_hp(user:get_hp() + hp_change)

if def and def.sound and def.sound.eat then
minetest.sound_play(def.sound.eat, { pos = user:get_pos(), max_hear_distance = 16 })
core.sound_play(def.sound.eat, {
pos = user:get_pos(),
max_hear_distance = 16
}, true)
end

if replace_with_item then
Expand Down Expand Up @@ -582,7 +585,10 @@ function core.node_dig(pos, node, digger)
if not core.settings:get_bool("creative_mode") then
wielded:add_wear(dp.wear)
if wielded:get_count() == 0 and wdef.sound and wdef.sound.breaks then
core.sound_play(wdef.sound.breaks, {pos = pos, gain = 0.5})
core.sound_play(wdef.sound.breaks, {
pos = pos,
gain = 0.5
}, true)
end
end
end
Expand Down

0 comments on commit 7d29611

Please sign in to comment.