From f03229acc19c85a0ebddc10423ec8226f0e09842 Mon Sep 17 00:00:00 2001
From: Kasey FItton <kaseyfitton@hotmail.co.uk>
Date: Thu, 24 Oct 2024 15:00:02 +0100
Subject: [PATCH] fix(es_extended/client): add missing params to remove
 warnings

---
 [core]/es_extended/client/functions.lua         |  4 ++--
 [core]/es_extended/client/modules/scaleform.lua |  8 ++++----
 [core]/es_extended/client/modules/streaming.lua | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/[core]/es_extended/client/functions.lua b/[core]/es_extended/client/functions.lua
index 5957831a..ab012b36 100644
--- a/[core]/es_extended/client/functions.lua
+++ b/[core]/es_extended/client/functions.lua
@@ -1352,11 +1352,11 @@ local mismatchedTypes = {
 }
 
 ---@param model number|string
----@return string
+---@return string | boolean
 function ESX.GetVehicleTypeClient(model)
     model = type(model) == "string" and joaat(model) or model
     if not IsModelInCdimage(model) then
-        return
+        return false
     end
     if mismatchedTypes[model] then
         return mismatchedTypes[model]
diff --git a/[core]/es_extended/client/modules/scaleform.lua b/[core]/es_extended/client/modules/scaleform.lua
index 46e20e12..b8a5359e 100644
--- a/[core]/es_extended/client/modules/scaleform.lua
+++ b/[core]/es_extended/client/modules/scaleform.lua
@@ -10,7 +10,7 @@ function ESX.Scaleform.ShowFreemodeMessage(title, msg, sec)
         Wait(0)
         sec = sec - 0.01
 
-        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255)
+        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
     SetScaleformMovieAsNoLongerNeeded(scaleform)
@@ -41,7 +41,7 @@ function ESX.Scaleform.ShowBreakingNews(title, msg, bottom, sec)
         Wait(0)
         sec = sec - 0.01
 
-        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255)
+        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
     SetScaleformMovieAsNoLongerNeeded(scaleform)
@@ -64,7 +64,7 @@ function ESX.Scaleform.ShowPopupWarning(title, msg, bottom, sec)
         Wait(0)
         sec = sec - 0.01
 
-        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255)
+        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
     SetScaleformMovieAsNoLongerNeeded(scaleform)
@@ -81,7 +81,7 @@ function ESX.Scaleform.ShowTrafficMovie(sec)
         Wait(0)
         sec = sec - 0.01
 
-        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255)
+        DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
     SetScaleformMovieAsNoLongerNeeded(scaleform)
diff --git a/[core]/es_extended/client/modules/streaming.lua b/[core]/es_extended/client/modules/streaming.lua
index 46cf16bd..7638b1f0 100644
--- a/[core]/es_extended/client/modules/streaming.lua
+++ b/[core]/es_extended/client/modules/streaming.lua
@@ -2,36 +2,36 @@ function ESX.Streaming.RequestModel(modelHash, cb)
     modelHash = type(modelHash) == "number" and modelHash or joaat(modelHash)
     if not IsModelInCdimage(modelHash) then return end
 	RequestModel(modelHash)
-	while not HasModelLoaded(modelHash) do Wait() end
+	while not HasModelLoaded(modelHash) do Wait(500) end
 	return cb and cb(modelHash) or modelHash
 end
 
 function ESX.Streaming.RequestStreamedTextureDict(textureDict, cb)
-	RequestStreamedTextureDict(textureDict)
-	while not HasStreamedTextureDictLoaded(textureDict) do Wait() end
+	RequestStreamedTextureDict(textureDict, false)
+	while not HasStreamedTextureDictLoaded(textureDict) do Wait(500) end
 	return cb and cb(textureDict) or textureDict
 end
 
 function ESX.Streaming.RequestNamedPtfxAsset(assetName, cb)
 	RequestNamedPtfxAsset(assetName)
-	while not HasNamedPtfxAssetLoaded(assetName) do Wait() end
+	while not HasNamedPtfxAssetLoaded(assetName) do Wait(500) end
 	return cb and cb(assetName) or assetName
 end
 
 function ESX.Streaming.RequestAnimSet(animSet, cb)
 	RequestAnimSet(animSet)
-	while not HasAnimSetLoaded(animSet) do Wait() end
+	while not HasAnimSetLoaded(animSet) do Wait(500) end
 	return cb and cb(animSet) or animSet
 end
 
 function ESX.Streaming.RequestAnimDict(animDict, cb)
 	RequestAnimDict(animDict)
-	while not HasAnimDictLoaded(animDict) do Wait() end
+	while not HasAnimDictLoaded(animDict) do Wait(500) end
 	return cb and cb(animDict) or animDict
 end
 
 function ESX.Streaming.RequestWeaponAsset(weaponHash, cb)
-	RequestWeaponAsset(weaponHash)
-	while not HasWeaponAssetLoaded(weaponHash) do Wait() end
+	RequestWeaponAsset(weaponHash, 31, 0)
+	while not HasWeaponAssetLoaded(weaponHash) do Wait(500) end
 	return cb and cb(weaponHash) or weaponHash
 end