mirror of
https://github.com/CommunityOx/ox_lib.git
synced 2026-08-16 22:46:03 +01:00
fix(resource/streaming): don't use HasModelLoaded for everything
This commit is contained in:
@@ -17,7 +17,7 @@ function lib.requestAnimDict(dict, timeout)
|
||||
if HasAnimDictLoaded(dict) then return dict end
|
||||
assert(DoesAnimDictExist(dict), ('Attempted to load an invalid animdict (%s)'):format(dict))
|
||||
RequestAnimDict(dict)
|
||||
return hasLoaded(HasModelLoaded, 'animdict', dict, timeout)
|
||||
return hasLoaded(HasAnimDictLoaded, 'animdict', dict, timeout)
|
||||
end
|
||||
|
||||
---@param set string
|
||||
@@ -26,7 +26,7 @@ end
|
||||
function lib.requestAnimSet(set, timeout)
|
||||
if HasAnimSetLoaded(set) then return set end
|
||||
RequestAnimSet(set)
|
||||
return hasLoaded(HasModelLoaded, 'animset', set, timeout)
|
||||
return hasLoaded(HasAnimSetLoaded, 'animset', set, timeout)
|
||||
end
|
||||
|
||||
---@param model string|number
|
||||
@@ -46,7 +46,7 @@ end
|
||||
function lib.requestStreamedTextureDict(dict, timeout)
|
||||
if HasStreamedTextureDictLoaded(dict) then return dict end
|
||||
RequestStreamedTextureDict(dict)
|
||||
return hasLoaded(HasModelLoaded, 'texture dict', dict, timeout)
|
||||
return hasLoaded(HasStreamedTextureDictLoaded, 'texture dict', dict, timeout)
|
||||
end
|
||||
|
||||
---@param fxName string
|
||||
@@ -55,5 +55,5 @@ end
|
||||
function lib.requestNamedPtfxAsset(fxName, timeout)
|
||||
if HasNamedPtfxAssetLoaded(fxName) then return fxName end
|
||||
RequestNamedPtfxAsset(fxName)
|
||||
return hasLoaded(HasModelLoaded, 'named ptfx', fxName, timeout)
|
||||
return hasLoaded(RequestNamedPtfxAsset, 'named ptfx', fxName, timeout)
|
||||
end
|
||||
Reference in New Issue
Block a user