starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(client/main): Fix spawn camera offset; set coords to spawn before loading character data; change screen fading

Browse Source 
Should prevent visual bugs while spawning and hopefully resolve the ESX Menu not appearing once and for all
This commit is contained in:
Linden
2021-06-24 18:09:05 +10:00
committed by GitHub
parent 17abe2d7bb
commit b3f236c2e0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+8 -4
View File
@@ -6,9 +6,8 @@ if ESX.GetConfig().Multichar then
Citizen.Wait(5) Citizen.Wait(5)
DoScreenFadeOut(0) DoScreenFadeOut(0)
while not GetResourceState('esx_menu_default') == 'started' do while not GetResourceState('esx_menu_default') == 'started' do
Citizen.Wait(10) Citizen.Wait(100)
end end
Citizen.Wait(300)
TriggerServerEvent("esx_multicharacter:SetupCharacters") TriggerServerEvent("esx_multicharacter:SetupCharacters")
TriggerEvent("esx_multicharacter:SetupCharacters") TriggerEvent("esx_multicharacter:SetupCharacters")
break break
@@ -25,7 +24,9 @@ if ESX.GetConfig().Multichar then
ESX.PlayerLoaded = false ESX.PlayerLoaded = false
ESX.PlayerData = {} ESX.PlayerData = {}
Spawned = false Spawned = false
cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", Config.Spawn.x, Config.Spawn.y+1.6, Config.Spawn.z+0.5, 0.0, 0.0, 180.0, 100.00, false, 0) cam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", Config.Spawn.x, Config.Spawn.y+1.6, Config.Spawn.z+1.3, 0.0, 0.0, 180.0, 100.00, false, 0)
SetEntityCoords(PlayerPedId(), Config.Spawn.x, Config.Spawn.y, Config.Spawn.z, true, false, false, false)
DoScreenFadeOut(0)
SetCamActive(cam, true) SetCamActive(cam, true)
RenderScriptCams(true, false, 1, true, true) RenderScriptCams(true, false, 1, true, true)
ESX.UI.HUD.SetDisplay(0.0) ESX.UI.HUD.SetDisplay(0.0)
@@ -125,6 +126,7 @@ if ESX.GetConfig().Multichar then
RegisterNetEvent('esx_multicharacter:SetupUI') RegisterNetEvent('esx_multicharacter:SetupUI')
AddEventHandler('esx_multicharacter:SetupUI', function(data) AddEventHandler('esx_multicharacter:SetupUI', function(data)
DoScreenFadeOut(0)
Characters = data Characters = data
local elements = {} local elements = {}
local Character = next(Characters) local Character = next(Characters)
@@ -140,7 +142,7 @@ if ESX.GetConfig().Multichar then
z = Config.Spawn.z, z = Config.Spawn.z,
heading = Config.Spawn.w, heading = Config.Spawn.w,
model = `mp_m_freemode_01`, model = `mp_m_freemode_01`,
skipFade = true skipFade = false
}, function() }, function()
exports.spawnmanager:setAutoSpawn(false) exports.spawnmanager:setAutoSpawn(false)
canRelog = false canRelog = false
@@ -151,6 +153,8 @@ if ESX.GetConfig().Multichar then
TriggerEvent('esx_identity:showRegisterIdentity') TriggerEvent('esx_identity:showRegisterIdentity')
end) end)
else else
DoScreenFadeIn(400)
while not IsScreenFadedIn() do Citizen.Wait(200) end
for k,v in pairs(Characters) do for k,v in pairs(Characters) do
if not v.model and v.skin then if not v.model and v.skin then
if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = `mp_f_freemode_01` else v.model = `mp_m_freemode_01` end if v.skin.model then v.model = v.skin.model elseif v.skin.sex == 1 then v.model = `mp_f_freemode_01` else v.model = `mp_m_freemode_01` end