Merge pull request #830 from fivemland/fix-779-2

fix(esx_property): some fixes and refactor

[esx]/esx_multicharacter/locales/hu.lua

@@ -1,15 +1,22 @@
 Locales["hu"] = {
 	["male"] = "Férfi",
 	["female"] = "Nő",
-	["delete_label"] = "Törlés %s %s?",
 	["select_char"] = "Karakter kiválasztása",
-	["select_char_description"] = "Select a character to play as.",
+	["select_char_description"] = "Karakter kiválasztása a játékhoz.",
 	["create_char"] = "Új karakter létrehozása",
 	["char_play"] = "Karakter kiválasztása",
+	["char_play_description"] = "Visszatérés a városba.",
 	["char_disabled"] = "Karakter le van tiltva",
+	["char_disabled_description"] = "Ez a karakter nem használható.",
 	["char_delete"] = "Karakter törlése",
-	["cancel"] = "Mégsem",
+	["char_delete_description"] = "Karakter végleges törlése.",
-	["confirm"] = "Megerősítés",
+	["char_delete_confirmation"] = "Törlés megerősítés",
+	["char_delete_confirmation_description"] = "Biztosan törölni szeretnéd a kiválasztott karaktert?",
+	["char_delete_yes_description"] = "Igen, törölni szeretném",
+	["char_delete_no_description"] = "Nem, vissza a karakter opciókhoz",
+	["character"] = "Karakter: %s",
+	["return"] = "Vissza",
+	["return_description"] = "Vissza a karakter választáshoz.",
 	["command_setslots"] = "Játékos karakter slotok számának beállítása",
 	["command_remslots"] = "Játékos karakter slotok számának eltávolítása",
 	["command_enablechar"] = "Játékos karakterének engedélyezése",

[esx_addons]/esx_property/client/cctv.lua

@@ -18,7 +18,6 @@
 function CCTV(PropertyID)
   DoScreenFadeOut(500)
   Wait(500)
-  local PlyCoordsBefore = GetEntityCoords(PlayerPedId())
   local Property = Properties[PropertyID]
   local CamTakePic = true
   if Property.cctv.enabled then
@@ -47,41 +46,41 @@ function CCTV(PropertyID)
           if Config.CCTV.PictureWebook ~= "" then
             PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT")
             PushScaleformMovieFunctionParameterInt(1)
-            N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Screenshot, true))
+            ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Screenshot, true))
             InstructionButtonMessage(TranslateCap("take_picture"))
             PopScaleformMovieFunctionVoid()
           end
 
           PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT")
           PushScaleformMovieFunctionParameterInt(2)
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, true))
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true))
           InstructionButtonMessage(TranslateCap("rot_left_right"))
           PopScaleformMovieFunctionVoid()
 
           PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT")
           PushScaleformMovieFunctionParameterInt(3)
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, true))
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true))
           InstructionButtonMessage(TranslateCap("rot_up_down"))
           PopScaleformMovieFunctionVoid()
 
           PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT")
           PushScaleformMovieFunctionParameterInt(4)
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true))
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true))
           InstructionButtonMessage(TranslateCap("zoom"))
           PopScaleformMovieFunctionVoid()
 
           PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT")
           PushScaleformMovieFunctionParameterInt(5)
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.NightVision, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.NightVision, true))
           InstructionButtonMessage(TranslateCap("night_vision"))
           PopScaleformMovieFunctionVoid()
 
           PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT")
           PushScaleformMovieFunctionParameterInt(0)
-          N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Exit, true))
+          ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Exit, true))
           InstructionButtonMessage(TranslateCap("exit"))
           PopScaleformMovieFunctionVoid()
 
@@ -99,7 +98,6 @@ function CCTV(PropertyID)
         end
         ESX.CloseContext()
         local cctvcam = nil
-        local angleZ = 0.0
         ClearFocus()
         local playerPed = PlayerPedId()
         cctvcam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA",