FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-17 06:56:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(client/progress): anim task/scenario check

Browse Source 
Correct behaviour from pull request #208.
Include some refactoring to reduce repetitive  table indexing.
This commit is contained in:
Linden
2023-02-03 13:25:30 +11:00
parent bd91dd81ab
commit 97d5bd6ac0
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
resource/interface/client/progress.lua
View File

@@ -61,15 +61,16 @@ local controls = {
local function startProgress(data)
playerState.invBusy = true
progress = data
local anim = data.anim
if data.anim then
if data.anim.dict then
lib.requestAnimDict(data.anim.dict)
if anim then
if anim.dict then
lib.requestAnimDict(anim.dict)
TaskPlayAnim(cache.ped, data.anim.dict, data.anim.clip, data.anim.blendIn or 3.0, data.anim.blendOut or 1.0, data.anim.duration or -1, data.anim.flag or 49, data.anim.playbackRate or 0, data.anim.lockX, data.anim.lockY, data.anim.lockZ)
RemoveAnimDict(data.anim.dict)
elseif data.anim.scenario then
TaskStartScenarioInPlace(cache.ped, data.anim.scenario, 0, data.anim.playEnter ~= nil and data.anim.playEnter or true)
TaskPlayAnim(cache.ped, anim.dict, anim.clip, anim.blendIn or 3.0, anim.blendOut or 1.0, anim.duration or -1, anim.flag or 49, anim.playbackRate or 0, anim.lockX, anim.lockY, anim.lockZ)
RemoveAnimDict(anim.dict)
elseif anim.scenario then
TaskStartScenarioInPlace(cache.ped, anim.scenario, 0, anim.playEnter ~= nil and anim.playEnter or true)
end
end
@@ -135,12 +136,14 @@ local function startProgress(data)
end
end
end
if data.anim then
StopAnimTask(cache.ped, data.anim.dict, data.anim.clip, 1.0)
Wait(0) -- This is needed here otherwise the StopAnimTask is cancelled
elseif data.anim.scenario then
ClearPedTasks(cache.ped)
if anim then
if anim.dict then
StopAnimTask(cache.ped, anim.dict, anim.clip, 1.0)
Wait(0) -- This is needed here otherwise the StopAnimTask is cancelled
else
ClearPedTasks(cache.ped)
end
end
playerState.invBusy = false