FumeNodes/ox_lib
1
0
Fork 0
mirror of https://github.com/CommunityOx/ox_lib.git synced 2026-08-18 15:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(resource/streaming): don't use HasModelLoaded for everything

Browse Source
This commit is contained in:
DokaDoka
2021-12-24 11:36:16 +11:00
parent cb0b99e147
commit b935d9b58c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resource/streaming/client.lua
View File

@@ -17,7 +17,7 @@ function lib.requestAnimDict(dict, timeout)
if HasAnimDictLoaded(dict) then return dict end if HasAnimDictLoaded(dict) then return dict end
assert(DoesAnimDictExist(dict), ('Attempted to load an invalid animdict (%s)'):format(dict)) assert(DoesAnimDictExist(dict), ('Attempted to load an invalid animdict (%s)'):format(dict))
RequestAnimDict(dict) RequestAnimDict(dict)
return hasLoaded(HasModelLoaded, 'animdict', dict, timeout) return hasLoaded(HasAnimDictLoaded, 'animdict', dict, timeout)
end end
---@param set string ---@param set string
@@ -26,7 +26,7 @@ end
function lib.requestAnimSet(set, timeout) function lib.requestAnimSet(set, timeout)
if HasAnimSetLoaded(set) then return set end if HasAnimSetLoaded(set) then return set end
RequestAnimSet(set) RequestAnimSet(set)
return hasLoaded(HasModelLoaded, 'animset', set, timeout) return hasLoaded(HasAnimSetLoaded, 'animset', set, timeout)
end end
---@param model string|number ---@param model string|number
@@ -46,7 +46,7 @@ end
function lib.requestStreamedTextureDict(dict, timeout) function lib.requestStreamedTextureDict(dict, timeout)
if HasStreamedTextureDictLoaded(dict) then return dict end if HasStreamedTextureDictLoaded(dict) then return dict end
RequestStreamedTextureDict(dict) RequestStreamedTextureDict(dict)
return hasLoaded(HasModelLoaded, 'texture dict', dict, timeout) return hasLoaded(HasStreamedTextureDictLoaded, 'texture dict', dict, timeout)
end end
---@param fxName string ---@param fxName string
@@ -55,5 +55,5 @@ end
function lib.requestNamedPtfxAsset(fxName, timeout) function lib.requestNamedPtfxAsset(fxName, timeout)
if HasNamedPtfxAssetLoaded(fxName) then return fxName end if HasNamedPtfxAssetLoaded(fxName) then return fxName end
RequestNamedPtfxAsset(fxName) RequestNamedPtfxAsset(fxName)
return hasLoaded(HasModelLoaded, 'named ptfx', fxName, timeout) return hasLoaded(RequestNamedPtfxAsset, 'named ptfx', fxName, timeout)
end end