1.4.9

FiveM-Scripts · Oct 6, 2019 · 69d8166 · 69d8166
1 parent e6f5142
commit 69d8166
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.4.9
+* Fixed labels for objects return NULL.
+
 ## 1.4.8
 * Server admins can now configure basic loadouts in config/weapons.lua.
 * Various issues regarding handcuffing have been fixed.

diff --git a/police/__resource.lua b/police/__resource.lua
@@ -1,6 +1,6 @@
 resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
-resource_version '1.4.8'
-resource_versionNum '148'
+resource_version '1.4.9'
+resource_versionNum '149'
 resource_Isdev 'no'
 resource_fname 'Cops FiveM'
 

diff --git a/police/client/menu.lua b/police/client/menu.lua
@@ -89,6 +89,14 @@ function load_menu()
 		buttonsProps[#buttonsProps+1] = {name = v.name, func = "SpawnProps", params = tostring(v.hash)}
 	end
 
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_PR_23"), hash="prop_mp_barrier_01b"}
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_PR_BARQADB"), hash="prop_barrier_work05"}
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_DPR_LTRFCN"), hash="prop_air_conelight"}
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_PR_PBARR"), hash="prop_barrier_work06a"}
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_PR_CABTBTH"), hash="prop_tollbooth_1"}
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_DPR_TRFCNE"), hash="prop_mp_cone_01"}
+	buttonsProps[#buttonsProps+1] = {name=GetLabelText("FMMC_DPR_TRFPLE"), hash="prop_mp_cone_04"}
+
 	buttonsProps[#buttonsProps+1] = {name = GetLabelText("collision_7x5xu9w"), func = "RemoveLastProps", params = ""}
 	buttonsProps[#buttonsProps+1] = {name = GetLabelText("FMMC_REMOBJ"), func = "RemoveAllProps", params = ""}
 end

diff --git a/police/config/objects.lua b/police/config/objects.lua
@@ -1,10 +1,4 @@
--- Configure the objects that cops can spawn on the map 
+-- Configure the objects that cops can spawn on the map.
 SpawnObjects = {
-	{name=GetLabelText("FMMC_PR_23"), hash="prop_mp_barrier_01b"},
-	{name=GetLabelText("FMMC_PR_BARQADB"), hash="prop_barrier_work05"},
-	{name=GetLabelText("FMMC_DPR_LTRFCN"), hash="prop_air_conelight"},
-	{name=GetLabelText("FMMC_PR_PBARR"), hash="prop_barrier_work06a"},
-	{name=GetLabelText("FMMC_PR_CABTBTH"), hash="prop_tollbooth_1"},
-	{name=GetLabelText("FMMC_DPR_TRFCNE"), hash="prop_mp_cone_01"},
-	{name=GetLabelText("FMMC_DPR_TRFPLE"), hash="prop_mp_cone_04"}
+	-- {name="Something", hash="prop_mp_barrier_01b"},
 }