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

refactor(client/progressbar): better animation cancelling (#208)

Browse Source
This commit is contained in:
JnKTechstuff
2023-02-02 21:22:51 -05:00
committed by GitHub
parent bd51fc72e0
commit bd91dd81ab
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,12 +68,8 @@ local function startProgress(data)
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) 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) RemoveAnimDict(data.anim.dict)
data.anim = true
elseif data.anim.scenario then elseif data.anim.scenario then
TaskStartScenarioInPlace(cache.ped, data.anim.scenario, 0, data.anim.playEnter ~= nil and data.anim.playEnter or true) TaskStartScenarioInPlace(cache.ped, data.anim.scenario, 0, data.anim.playEnter ~= nil and data.anim.playEnter or true)
data.anim = true
end end
end end
@@ -129,10 +125,6 @@ local function startProgress(data)
Wait(0) Wait(0)
end end
if data.anim then
ClearPedTasks(cache.ped)
end
if data.prop then if data.prop then
local n = #data.prop local n = #data.prop
for i = 1, n > 0 and n or 1 do for i = 1, n > 0 and n or 1 do
@@ -144,6 +136,13 @@ local function startProgress(data)
end 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)
end
playerState.invBusy = false playerState.invBusy = false
local cancel = progress == false local cancel = progress == false
progress = nil progress = nil