mtcontrib/ambience
1
0
Fork 1
mirror of https://codeberg.org/tenplus1/ambience.git synced 2024-12-24 01:30:30 +01:00
Code Issues Releases Wiki Activity

better sound handling when changing sets

Browse Source
This commit is contained in:
tenplus1 2020-06-15 17:50:57 +01:00
parent d5ff07abe0
commit 11eff9462b
1 changed files with 58 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
init.lua
View File

@ -199,28 +199,19 @@ minetest.register_globalstep(function(dtime)
ok = true -- everything starts off ok
-- check set exists
if set_name ~= nil and not sound_sets[set_name] then
print("[ambience] sound set doesn't exist:", set_name)
ok = false -- don't continue, set missing
end
-- are we ok and have a set name
if ok and set_name then
-- stop current sound if another set active or gain changed
if playing[player_name]
and playing[player_name].handler then
if playing[player_name].sound ~= set_name
or (playing[player_name].sound == set_name
if playing[player_name].set ~= set_name
or (playing[player_name].set == set_name
and playing[player_name].gain ~= MORE_GAIN) then
--print ("-- change stop")
minetest.sound_stop(playing[player_name].handler)
playing[player_name].sound = nil
--print ("-- change stop", set_name, playing[player_name].old_handler)
minetest.sound_stop(playing[player_name].old_handler)
playing[player_name].set = nil
playing[player_name].handler = nil
playing[player_name].gain = nil
else
@ -234,53 +225,55 @@ minetest.register_globalstep(function(dtime)
math.randomseed(tod + chance)
-- if chance is lower than set frequency then select set
if ok and chance < sound_sets[set_name].frequency then
if ok and set_name and chance < sound_sets[set_name].frequency then
-- choose random sound from set selected
number = random(1, #sound_sets[set_name].sounds)
-- choose random sound from set
number = random(#sound_sets[set_name].sounds)
ambience = sound_sets[set_name].sounds[number]
-- play sound
handler = minetest.sound_play(ambience.name, {
to_player = player_name,
gain = ((ambience.gain or 0.3) + (MORE_GAIN or 0)) * SOUNDVOLUME
gain = ((ambience.gain or 0.3) + (MORE_GAIN or 0)) * SOUNDVOLUME,
pitch = ambience.pitch or 1.0
}, ambience.ephemeral)
-- only continue if sound is playing
if handler then
--print ("playing... " .. ambience.name .. " (" .. chance .. " < "
-- .. sound_sets[set_name].frequency .. ") @ ", MORE_GAIN)
-- only continue if sound playing returns handler
if handler then
--print("-- current handler", handler)
-- set what player is currently listening to
playing[player_name] = playing[player_name] or {}
playing[player_name].handler = handler
playing[player_name].sound = set_name
playing[player_name].set = set_name
playing[player_name].gain = MORE_GAIN
playing[player_name].old_handler = handler
-- set timer to stop sound
minetest.after(ambience.length, function(args)
local player_name = args[2]
minetest.after(ambience.length, function()
-- make sure we are stopping same sound we started
if playing[player_name]
and playing[player_name].handler
and playing[player_name].sound == set_name
and playing[player_name].set == set_name
and handler == playing[player_name].old_handler then
--print("-- timed stop")
minetest.sound_stop(playing[player_name].handler)
-- reset player variables
playing[player_name].sound = nil
--print("-- timed stop", set_name, handler)
--minetest.sound_stop(playing[player_name].handler)
minetest.sound_stop(playing[player_name].old_handler)
-- reset player variables and backup handler
playing[player_name].set = nil
playing[player_name].handler = nil
playing[player_name].gain = nil
playing[player_name].old_handler = handler
end
end, {ambience, player_name})
end
end)
end
end
end