starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-28 17:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
fix(esx_property): some fixes and refactor
This commit is contained in:
Gellipapa
2023-01-11 00:41:02 +01:00
committed by GitHub
parent cef3d2172f d822a90273
commit 00c0006e93
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx]/esx_multicharacter/locales/hu.lua
+11 -4
View File
@@ -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",
["confirm"] = "Megerősítés",
["char_delete_description"] = "Karakter végleges törlése.",
["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
+9 -11
View File
@@ -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))
N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true))
ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, 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))
N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true))
ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, 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))
N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true))
ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, 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",
[esx_addons]/esx_property/es.lua → [esx_addons]/esx_property/locales/es.lua
View File