Skip to content

Commit

Permalink
fix: audio bank an optional param and playSoundFromEntity server side…
Browse files Browse the repository at this point in the history
… now works
  • Loading branch information
Manason committed Dec 26, 2023
1 parent e6bf30e commit bd3df9e
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions client/main.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
local function loadAudioBank(audioBank)
if not audioBank then return end
local timeout = 500
while not RequestScriptAudioBank(audioBank, false) do
if timeout == 0 then
Expand All @@ -11,8 +12,13 @@ local function loadAudioBank(audioBank)
return true
end

local function releaseAudioBank(audioBank)
if not audioBank then return end
ReleaseNamedScriptAudioBank(audioBank)
end

---@class PlaySoundParams
---@field audioBank string
---@field audioBank? string
---@field audioName string|string[]
---@field audioRef string

Expand All @@ -27,12 +33,12 @@ local function playSound(data)
PlaySoundFrontend(soundId, audioName, data.audioRef, false)
ReleaseSoundId(soundId)
end
ReleaseNamedScriptAudioBank(data.audioBank)
releaseAudioBank(data.audioBank)
end

exports('PlaySound', playSound)

RegisterNetEvent('mana_audio:client:playSoundFromEntity', playSound)
RegisterNetEvent('mana_audio:client:playSound', playSound)

---@class PlaySoundFromEntityParams: PlaySoundParams
---@field entity number
Expand All @@ -49,7 +55,7 @@ local function playSoundFromEntity(data)
PlaySoundFromEntity(soundId, audioName, data.entity, data.audioRef, false, false)
ReleaseSoundId(soundId)
end
ReleaseNamedScriptAudioBank(data.audioBank)
releaseAudioBank(data.audioBank)
end

exports('PlaySoundFromEntity', playSoundFromEntity)
Expand Down Expand Up @@ -79,7 +85,7 @@ local function playSoundFromCoords(data)
PlaySoundFromCoord(soundId, audioName, data.coords.x, data.coords.y, data.coords.z, data.audioRef, false, data.range, false)
ReleaseSoundId(soundId)
end
ReleaseNamedScriptAudioBank(data.audioBank)
releaseAudioBank(data.audioBank)
end

exports('PlaySoundFromCoords', playSoundFromCoords)
Expand Down

0 comments on commit bd3df9e

Please sign in to comment.