mirror of
https://github.com/CommunityOx/ox_lib.git
synced 2026-08-19 16:06:02 +01:00
refactor(streamingRequest): internal method for request functions
- TS package type inference for request functions. - Type fix for Lua's waitFor callback. - Lua request functions cannot return nil.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
---Load a named particle effect. When called from a thread, it will yield until it has loaded.
|
||||
---@param ptFxName string
|
||||
---@param timeout number? Approximate milliseconds to wait for the particle effect to load. Default is 1000.
|
||||
---@return string? ptFxName
|
||||
---@return string ptFxName
|
||||
function lib.requestNamedPtfxAsset(ptFxName, timeout)
|
||||
if HasNamedPtfxAssetLoaded(ptFxName) then return ptFxName end
|
||||
|
||||
@@ -9,13 +9,7 @@ function lib.requestNamedPtfxAsset(ptFxName, timeout)
|
||||
error(("expected ptFxName to have type 'string' (received %s)"):format(type(ptFxName)))
|
||||
end
|
||||
|
||||
RequestNamedPtfxAsset(ptFxName)
|
||||
|
||||
if not coroutine.isyieldable() then return ptFxName end
|
||||
|
||||
return lib.waitFor(function()
|
||||
if HasNamedPtfxAssetLoaded(ptFxName) then return ptFxName end
|
||||
end, ("failed to load ptFxName '%s'"):format(ptFxName), timeout)
|
||||
return lib.streamingRequest(RequestNamedPtfxAsset, HasNamedPtfxAssetLoaded, 'ptFxName', ptFxName, timeout)
|
||||
end
|
||||
|
||||
return lib.requestNamedPtfxAsset
|
||||
|
||||
Reference in New Issue
Block a user