mirror of
https://codeberg.org/tenplus1/ambience.git
synced 2024-12-23 09:10:30 +01:00
code tweak
This commit is contained in:
parent
3f11ca9127
commit
925c94689b
23
init.lua
23
init.lua
@ -200,17 +200,17 @@ minetest.register_globalstep(function(dtime)
|
|||||||
|
|
||||||
ok = true -- everything starts off ok
|
ok = true -- everything starts off ok
|
||||||
|
|
||||||
-- stop current sound if another set active or gain changed
|
-- are we playing something already?
|
||||||
if playing[player_name]
|
if playing[player_name]
|
||||||
and playing[player_name].handler then
|
and playing[player_name].handler then
|
||||||
|
|
||||||
|
-- stop current sound if another set active or gain changed
|
||||||
if playing[player_name].set ~= set_name
|
if playing[player_name].set ~= set_name
|
||||||
or (playing[player_name].set == set_name
|
or playing[player_name].gain ~= MORE_GAIN then
|
||||||
and playing[player_name].gain ~= MORE_GAIN) then
|
|
||||||
|
|
||||||
--print ("-- change stop", set_name, playing[player_name].old_handler)
|
--print ("-- change stop", set_name, playing[player_name].handler)
|
||||||
|
|
||||||
minetest.sound_stop(playing[player_name].old_handler)
|
minetest.sound_stop(playing[player_name].handler)
|
||||||
|
|
||||||
playing[player_name].set = nil
|
playing[player_name].set = nil
|
||||||
playing[player_name].handler = nil
|
playing[player_name].handler = nil
|
||||||
@ -220,11 +220,9 @@ minetest.register_globalstep(function(dtime)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- set random chance and reset seed
|
-- set random chance
|
||||||
chance = random(1, 1000)
|
chance = random(1, 1000)
|
||||||
|
|
||||||
math.randomseed(tod + chance)
|
|
||||||
|
|
||||||
-- if chance is lower than set frequency then select set
|
-- if chance is lower than set frequency then select set
|
||||||
if ok and set_name and chance < sound_sets[set_name].frequency then
|
if ok and set_name and chance < sound_sets[set_name].frequency then
|
||||||
|
|
||||||
@ -249,8 +247,7 @@ minetest.register_globalstep(function(dtime)
|
|||||||
|
|
||||||
-- set what player is currently listening to
|
-- set what player is currently listening to
|
||||||
playing[player_name] = {
|
playing[player_name] = {
|
||||||
set = set_name, gain = MORE_GAIN,
|
set = set_name, gain = MORE_GAIN, handler = handler
|
||||||
handler = handler, old_handler = handler
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-- set timer to stop sound
|
-- set timer to stop sound
|
||||||
@ -261,17 +258,15 @@ minetest.register_globalstep(function(dtime)
|
|||||||
-- make sure we are stopping same sound we started
|
-- make sure we are stopping same sound we started
|
||||||
if playing[player_name]
|
if playing[player_name]
|
||||||
and playing[player_name].handler
|
and playing[player_name].handler
|
||||||
and playing[player_name].old_handler == handler then
|
and playing[player_name].handler == handler then
|
||||||
|
|
||||||
--print("-- timed stop", set_name, handler)
|
--print("-- timed stop", set_name, handler)
|
||||||
|
|
||||||
--minetest.sound_stop(playing[player_name].handler)
|
|
||||||
minetest.sound_stop(handler)
|
minetest.sound_stop(handler)
|
||||||
|
|
||||||
-- reset player variables and backup handler
|
-- reset player variables and backup handler
|
||||||
playing[player_name] = {
|
playing[player_name] = {
|
||||||
set = nil, gain = nil,
|
set = nil, gain = nil, handler = nil
|
||||||
handler = nil, old_handler = nil
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
Loading…
Reference in New Issue
Block a user