Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

#264, #280 fixed sounder issues

Browse Source
This commit is contained in:
Mikayla Fischler
2023-07-26 22:37:25 -04:00
parent 1c87ef18a1
commit 9f8732830c
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scada-common/audio.lua
View File

@ -254,7 +254,7 @@ function audio.new_stream()
---@param index tone_id tone ID ---@param index tone_id tone ID
---@param active boolean active state ---@param active boolean active state
function public.set_active(index, active) function public.set_active(index, active)
if self.tone_active[index] then if self.tone_active[index] ~= nil then
if self.tone_active[index] ~= active then self.need_recompute = true end if self.tone_active[index] ~= active then self.need_recompute = true end
self.tone_active[index] = active self.tone_active[index] = active
end end
@ -289,7 +289,7 @@ function audio.new_stream()
self.any_active = true self.any_active = true
for i = 1, 4 do for i = 1, 4 do
local buffer = self.quad_buffer[i] local buffer = self.quad_buffer[i]
local values = tone_data[id] local values = tone_data[id][i]
for s = 1, _05s_SAMPLES do self.quad_buffer[i][s] = limit(buffer[s] + values[s]) end for s = 1, _05s_SAMPLES do self.quad_buffer[i][s] = limit(buffer[s] + values[s]) end
end end
end end

3
supervisor/facility.lua
View File

@ -762,7 +762,8 @@ function facility.new(num_reactors, cooling_conf)
-- Update Alarm Tones -- -- Update Alarm Tones --
------------------------ ------------------------
local alarms = { false, false, false, false, false, false, false, false, false, false, false, false } local alarms = { false, false, false, false, false, false, false, false, false, false, false, false }
self.tone_states = { false, false, false, false, false, false, false, false}
-- check all alarms for all units -- check all alarms for all units
for i = 1, #self.units do for i = 1, #self.units do