Fix security offices #141

Author: TheIndra55

README.md

@@ -30,6 +30,9 @@ This resource has been completely rewritten from scratch since v2.0. You can cus
 (DD/MM/YYYY)
 
 ---
+29/07/2024 - 2.3.1
+- Fix world not rendering when inside security offices
+
 02/07/2024 - 2.3.0
 - Added "Bottom Dollar Bounties" support
 

fxmanifest.lua

@@ -3,14 +3,15 @@ game 'gta5'
 
 author 'Bob_74'
 description 'Load and customize your map'
-version '2.3.0'
+version '2.3.1'
 
 lua54 "yes"
 
 client_scripts {
     "lib/common.lua"
     , "lib/observers/interiorIdObserver.lua"
     , "lib/observers/officeSafeDoorHandler.lua"
+    , "lib/observers/officeCullHandler.lua"
     , "client.lua"
 
     -- GTA V

lib/common.lua

@@ -35,11 +35,17 @@ Global = {
         isInsideApartment5 = false,
         isInsideApartment6 = false
     },
+    Security = {
+        isInsideOffice1 = false,
+        isInsideOffice2 = false,
+        isInsideOffice3 = false,
+        isInsideOffice4 = false
+    },
 
     -- Set all interiors variables to false
     -- The loop inside 'interiorIdObserver' will set them to true
     ResetInteriorVariables = function()
-        for _, parentKey in pairs{"Biker", "FinanceOffices", "HighLife"} do
+        for _, parentKey in pairs{"Biker", "FinanceOffices", "HighLife", "Security"} do
             local t = Global[parentKey]
 
             for key in pairs(t) do

lib/observers/interiorIdObserver.lua

@@ -3,7 +3,7 @@ local _scanDelay = 500
 Citizen.CreateThread(function()
     while true do
         -- /!\ To do: Find a more reliable way to get the current interior ID
-        Global.currentInteriorId = GetInteriorAtCoords(GetEntityCoords(PlayerPedId()))
+        Global.currentInteriorId = GetInteriorFromEntity(PlayerPedId())
 
         if Global.currentInteriorId == 0 then
             Global.ResetInteriorVariables()
@@ -41,6 +41,12 @@ Citizen.CreateThread(function()
             Global.FinanceOffices.isInsideOffice2 = (Global.currentInteriorId == FinanceOffice2.currentInteriorId)
             Global.FinanceOffices.isInsideOffice3 = (Global.currentInteriorId == FinanceOffice3.currentInteriorId)
             Global.FinanceOffices.isInsideOffice4 = (Global.currentInteriorId == FinanceOffice4.currentInteriorId)
+
+            -- DLC: The Contract
+            Global.Security.isInsideOffice1 = (Global.currentInteriorId == MpSecurityOffice1.InteriorId)
+            Global.Security.isInsideOffice2 = (Global.currentInteriorId == MpSecurityOffice2.InteriorId)
+            Global.Security.isInsideOffice3 = (Global.currentInteriorId == MpSecurityOffice3.InteriorId)
+            Global.Security.isInsideOffice4 = (Global.currentInteriorId == MpSecurityOffice4.InteriorId)
         end
 
         Citizen.Wait(_scanDelay)

lib/observers/officeCullHandler.lua

@@ -0,0 +1,35 @@
+CreateThread(function()
+    while true do
+        if Global.Security.isInsideOffice1 then
+            EnableExteriorCullModelThisFrame(`bh1_05_build1`)
+            EnableExteriorCullModelThisFrame(`bh1_05_em`)
+
+            DisableOcclusionThisFrame()
+        end
+
+        if Global.Security.isInsideOffice2 then
+            EnableExteriorCullModelThisFrame(`hei_hw1_08_hotplaz01`)
+            EnableExteriorCullModelThisFrame(`hw1_08_hotplaz_rail`)
+            EnableExteriorCullModelThisFrame(`hw1_08_emissive_c`)
+
+            DisableOcclusionThisFrame()
+        end
+
+        if Global.Security.isInsideOffice3 then
+            EnableExteriorCullModelThisFrame(`hei_kt1_05_01`)
+            EnableExteriorCullModelThisFrame(`kt1_05_glue_b`)
+            EnableExteriorCullModelThisFrame(`kt1_05_kt_emissive_kt1_05`)
+
+            DisableOcclusionThisFrame()
+        end
+
+        if Global.Security.isInsideOffice4 then
+            EnableExteriorCullModelThisFrame(`hei_kt1_08_buildingtop_a`)
+            EnableExteriorCullModelThisFrame(`hei_kt1_08_kt1_emissive_ema`)
+
+            DisableOcclusionThisFrame()
+        end
+
+        Wait(0)
+    end
+end)