Skip to content

Commit d3e26db

Browse files
committed
Convert minetest.sound_play uses to ephemeral
1 parent 176ddba commit d3e26db

File tree

9 files changed

+28
-22
lines changed

9 files changed

+28
-22
lines changed

mods/carts/cart_entity.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ minetest.register_craftitem("carts:cart", {
414414
end
415415

416416
minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
417-
{pos = pointed_thing.above})
417+
{pos = pointed_thing.above}, true)
418418

419419
if not (creative and creative.is_enabled_for
420420
and creative.is_enabled_for(placer:get_player_name())) then

mods/default/chests.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ function default.chest.chest_lid_close(pn)
4646
local node = minetest.get_node(pos)
4747
minetest.after(0.2, minetest.swap_node, pos, { name = "default:" .. swap,
4848
param2 = node.param2 })
49-
minetest.sound_play(sound, {gain = 0.3, pos = pos, max_hear_distance = 10})
49+
minetest.sound_play(sound, {gain = 0.3, pos = pos,
50+
max_hear_distance = 10}, true)
5051
end
5152

5253
default.chest.open_chests = {}
@@ -128,7 +129,7 @@ function default.chest.register_chest(name, d)
128129
end
129130

130131
minetest.sound_play(def.sound_open, {gain = 0.3,
131-
pos = pos, max_hear_distance = 10})
132+
pos = pos, max_hear_distance = 10}, true)
132133
if not default.chest.chest_lid_obstructed(pos) then
133134
minetest.swap_node(pos,
134135
{ name = "default:" .. name .. "_open",
@@ -199,7 +200,7 @@ function default.chest.register_chest(name, d)
199200
end
200201
def.on_rightclick = function(pos, node, clicker)
201202
minetest.sound_play(def.sound_open, {gain = 0.3, pos = pos,
202-
max_hear_distance = 10})
203+
max_hear_distance = 10}, true)
203204
if not default.chest.chest_lid_obstructed(pos) then
204205
minetest.swap_node(pos, {
205206
name = "default:" .. name .. "_open",

mods/default/functions.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ default.cool_lava = function(pos, node)
141141
minetest.set_node(pos, {name = "default:stone"})
142142
end
143143
minetest.sound_play("default_cool_lava",
144-
{pos = pos, max_hear_distance = 16, gain = 0.25})
144+
{pos = pos, max_hear_distance = 16, gain = 0.25}, true)
145145
end
146146

147147
if minetest.settings:get_bool("enable_lavacooling") ~= false then

mods/default/item_entity.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ local item = {
2020
minetest.sound_play("default_item_smoke", {
2121
pos = p,
2222
max_hear_distance = 8,
23-
})
23+
}, true)
2424
minetest.add_particlespawner({
2525
amount = 3,
2626
time = 0.1,

mods/default/torch.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ local function on_flood(pos, oldnode, newnode)
1111
nodedef.groups.igniter and nodedef.groups.igniter > 0) then
1212
minetest.sound_play(
1313
"default_cool_lava",
14-
{pos = pos, max_hear_distance = 16, gain = 0.1}
14+
{pos = pos, max_hear_distance = 16, gain = 0.1},
15+
true
1516
)
1617
end
1718
-- Remove the torch node

mods/doors/init.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ function doors.door_toggle(pos, node, clicker)
176176

177177
if state % 2 == 0 then
178178
minetest.sound_play(def.door.sounds[1],
179-
{pos = pos, gain = 0.3, max_hear_distance = 10})
179+
{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
180180
else
181181
minetest.sound_play(def.door.sounds[2],
182-
{pos = pos, gain = 0.3, max_hear_distance = 10})
182+
{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
183183
end
184184

185185
minetest.swap_node(pos, {
@@ -340,7 +340,7 @@ function doors.register(name, def)
340340
itemstack:take_item()
341341
end
342342

343-
minetest.sound_play(def.sounds.place, {pos = pos})
343+
minetest.sound_play(def.sounds.place, {pos = pos}, true)
344344

345345
on_place_node(pos, minetest.get_node(pos),
346346
placer, node, itemstack, pointed_thing)
@@ -550,12 +550,12 @@ function doors.trapdoor_toggle(pos, node, clicker)
550550

551551
if string.sub(node.name, -5) == "_open" then
552552
minetest.sound_play(def.sound_close,
553-
{pos = pos, gain = 0.3, max_hear_distance = 10})
553+
{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
554554
minetest.swap_node(pos, {name = string.sub(node.name, 1,
555555
string.len(node.name) - 5), param1 = node.param1, param2 = node.param2})
556556
else
557557
minetest.sound_play(def.sound_open,
558-
{pos = pos, gain = 0.3, max_hear_distance = 10})
558+
{pos = pos, gain = 0.3, max_hear_distance = 10}, true)
559559
minetest.swap_node(pos, {name = node.name .. "_open",
560560
param1 = node.param1, param2 = node.param2})
561561
end
@@ -744,7 +744,7 @@ function doors.register_fencegate(name, def)
744744
local node_def = minetest.registered_nodes[node.name]
745745
minetest.swap_node(pos, {name = node_def.gate, param2 = node.param2})
746746
minetest.sound_play(node_def.sound, {pos = pos, gain = 0.3,
747-
max_hear_distance = 8})
747+
max_hear_distance = 8}, true)
748748
return itemstack
749749
end,
750750
selection_box = {

mods/farming/api.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses)
5959
minetest.sound_play("default_dig_crumbly", {
6060
pos = pt.under,
6161
gain = 0.5,
62-
})
62+
}, true)
6363

6464
if not (creative and creative.is_enabled_for
6565
and creative.is_enabled_for(user:get_player_name())) then
@@ -68,7 +68,8 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses)
6868
itemstack:add_wear(65535/(uses-1))
6969
-- tool break sound
7070
if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then
71-
minetest.sound_play(wdef.sound.breaks, {pos = pt.above, gain = 0.5})
71+
minetest.sound_play(wdef.sound.breaks, {pos = pt.above,
72+
gain = 0.5}, true)
7273
end
7374
end
7475
return itemstack

mods/fire/init.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ local function flood_flame(pos, oldnode, newnode)
3434
if not (nodedef and nodedef.groups and
3535
nodedef.groups.igniter and nodedef.groups.igniter > 0) then
3636
minetest.sound_play("fire_extinguish_flame",
37-
{pos = pos, max_hear_distance = 16, gain = 0.15})
37+
{pos = pos, max_hear_distance = 16, gain = 0.15}, true)
3838
end
3939
-- Remove the flame
4040
return false
@@ -127,7 +127,8 @@ minetest.register_tool("fire:flint_and_steel", {
127127
local sound_pos = pointed_thing.above or user:get_pos()
128128
minetest.sound_play(
129129
"fire_flint_and_steel",
130-
{pos = sound_pos, gain = 0.5, max_hear_distance = 8}
130+
{pos = sound_pos, gain = 0.5, max_hear_distance = 8},
131+
true
131132
)
132133
local player_name = user:get_player_name()
133134
if pointed_thing.type == "node" then
@@ -154,7 +155,8 @@ minetest.register_tool("fire:flint_and_steel", {
154155
itemstack:add_wear(1000)
155156
-- Tool break sound
156157
if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then
157-
minetest.sound_play(wdef.sound.breaks, {pos = sound_pos, gain = 0.5})
158+
minetest.sound_play(wdef.sound.breaks, {pos = sound_pos,
159+
gain = 0.5}, true)
158160
end
159161
return itemstack
160162
end

mods/tnt/init.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ function tnt.burn(pos, nodename)
274274
def.on_ignite(pos)
275275
elseif minetest.get_item_group(name, "tnt") > 0 then
276276
minetest.swap_node(pos, {name = name .. "_burning"})
277-
minetest.sound_play("tnt_ignite", {pos = pos})
277+
minetest.sound_play("tnt_ignite", {pos = pos}, true)
278278
minetest.get_node_timer(pos):start(1)
279279
end
280280
end
@@ -403,7 +403,7 @@ function tnt.boom(pos, def)
403403
end
404404
local sound = def.sound or "tnt_explode"
405405
minetest.sound_play(sound, {pos = pos, gain = 2.5,
406-
max_hear_distance = math.min(def.radius * 20, 128)})
406+
max_hear_distance = math.min(def.radius * 20, 128)}, true)
407407
local drops, radius = tnt_explode(pos, def.radius, def.ignore_protection,
408408
def.ignore_on_blast, owner, def.explode_center)
409409
-- append entity drops
@@ -541,7 +541,8 @@ minetest.register_node("tnt:gunpowder_burning", {
541541
-- unaffected by explosions
542542
on_blast = function() end,
543543
on_construct = function(pos)
544-
minetest.sound_play("tnt_gunpowder_burning", {pos = pos, gain = 2})
544+
minetest.sound_play("tnt_gunpowder_burning", {pos = pos,
545+
gain = 2}, true)
545546
minetest.get_node_timer(pos):start(1)
546547
end,
547548
})
@@ -672,7 +673,7 @@ function tnt.register_tnt(def)
672673
-- unaffected by explosions
673674
on_blast = function() end,
674675
on_construct = function(pos)
675-
minetest.sound_play("tnt_ignite", {pos = pos})
676+
minetest.sound_play("tnt_ignite", {pos = pos}, true)
676677
minetest.get_node_timer(pos):start(4)
677678
minetest.check_for_falling(pos)
678679
end,

0 commit comments

Comments
 (0)