Merge pull request #1599 from fnbar0/dev

refactor(es_extended/client/modules/scaleform): Make scaleforms show duration framerate independent

[core]/es_extended/client/modules/scaleform.lua

@@ -3,11 +3,10 @@ ESX.Scaleform.Utils = {}
 
 function ESX.Scaleform.ShowFreemodeMessage(title, msg, sec)
     local scaleform = ESX.Scaleform.Utils.RunMethod("MP_BIG_MESSAGE_FREEMODE", "SHOW_SHARD_WASTED_MP_MESSAGE", false, title, msg)
-
-    while sec > 0 do
+
+    local endTime = GetGameTimer() + (sec * 1000)
+    while GetGameTimer() < endTime do
         Wait(0)
-        sec = sec - 0.01
-
         DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
@@ -19,10 +18,9 @@ function ESX.Scaleform.ShowBreakingNews(title, msg, bottom, sec)
     ESX.Scaleform.Utils.RunMethod(scaleform, "SET_SCROLL_TEXT", false, 0, 0, title)
     ESX.Scaleform.Utils.RunMethod(scaleform, "DISPLAY_SCROLL_TEXT", false, 0, 0)
 
-    while sec > 0 do
+    local endTime = GetGameTimer() + (sec * 1000)
+    while GetGameTimer() < endTime do
         Wait(0)
-        sec = sec - 0.01
-
         DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
@@ -32,10 +30,9 @@ end
 function ESX.Scaleform.ShowPopupWarning(title, msg, bottom, sec)
     local scaleform = ESX.Scaleform.Utils.RunMethod("POPUP_WARNING", "SHOW_POPUP_WARNING", false, 500.0, title, msg, bottom, true)
 
-    while sec > 0 do
+    local endTime = GetGameTimer() + (sec * 1000)
+    while GetGameTimer() < endTime do
         Wait(0)
-        sec = sec - 0.01
-
         DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end
 
@@ -45,10 +42,9 @@ end
 function ESX.Scaleform.ShowTrafficMovie(sec)
     local scaleform = ESX.Scaleform.Utils.RunMethod("TRAFFIC_CAM", "PLAY_CAM_MOVIE", false)
 
-    while sec > 0 do
+    local endTime = GetGameTimer() + (sec * 1000)
+    while GetGameTimer() < endTime do
         Wait(0)
-        sec = sec - 0.01
-
         DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
     end