refactor: implement new config from apartments

Qbox-project · Nov 26, 2023 · 1b565de · 1b565de
1 parent 005176d
commit 1b565de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/client.lua b/client.lua
@@ -1,3 +1,4 @@
+local config = require '@qbx_apartments.config.shared'
 local camZPlus1 = 1500
 local camZPlus2 = 50
 local pointCamCoords = 75
@@ -123,7 +124,7 @@ RegisterNUICallback('setCam', function(data, cb)
     elseif type == "normal" then
         SetCam(QB.Spawns[location].coords)
     elseif type == "appartment" then
-        SetCam(Apartments.Locations[location].coords.enter)
+        SetCam(config.locations[location].coords.enter)
     end
     cb('ok')
 end)
@@ -133,7 +134,7 @@ RegisterNUICallback('chooseAppa', function(data, cb)
     setDisplay(false)
     DoScreenFadeOut(500)
     Wait(5000)
-    TriggerServerEvent("apartments:server:CreateApartment", appaYeet, Apartments.Locations[appaYeet].label)
+    TriggerServerEvent("apartments:server:CreateApartment", appaYeet, config.locations[appaYeet].label)
     TriggerServerEvent('QBCore:Server:OnPlayerLoaded')
     TriggerEvent('QBCore:Client:OnPlayerLoaded')
     FreezeEntityPosition(cache.ped, false)

diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -8,7 +8,6 @@ version '1.0.0'
 shared_scripts {
 	'config.lua',
 	'@ox_lib/init.lua',
-	'@qbx_apartments/config.lua'
 }
 
 client_scripts {
@@ -31,5 +30,4 @@ files {
 }
 
 lua54 'yes'
-
 use_experimental_fxv2_oal 'yes'