Merge pull request #118 from acidlabsdev/main

fix(Factory): cache script global instances

Author: xesdoog

SSV2/includes/classes/gta/CEntity.lua

@@ -67,18 +67,34 @@ function CEntity:IsValid()
 	return self.m_ptr and self.m_ptr:is_valid()
 end
 
+---@generic R1, R2, R3, R4, R5
+---@param default any
+---@param func fun(...?): R1, R2?, R3?, R4?, R5?, ...?
+---@param ... any
+---@return R1, R2?, R3?, R4?, R5?, ...?
+function CEntity:__safecall(default, func, ...)
+	if (not self:IsValid()) then
+		return default
+	end
+
+	return func(...)
+end
+
+---@return pointer
+function CEntity:GetPointer()
+	return self.m_ptr
+end
+
 ---@return uint64_t
 function CEntity:GetAddress()
 	return self.m_ptr:get_address()
 end
 
 ---@return eModelType
 function CEntity:GetModelType()
-	if not self:IsValid() then
-		return Enums.eModelType.Invalid
-	end
-
-	return (self.m_model_type:get_word() & 0x1F)
+	return self:__safecall(Enums.eModelType.Invalid, function()
+		return self.m_model_type:get_word() & 0x1F
+	end)
 end
 
 return CEntity

SSV2/includes/classes/gta/CPed.lua

@@ -63,52 +63,49 @@ end
 
 ---@return boolean
 function CPed:CanRagdoll()
-	if not self:IsValid() then
-		return false
-	end
-
-	return (self.m_ped_type & 0x20) ~= 0
+	return self:__safecall(false, function()
+		return (self.m_ped_type & 0x20) ~= 0
+	end)
 end
 
 ---@return boolean
 function CPed:HasSeatbelt()
-	if not self:IsValid() then
-		return false
-	end
-
-	return (self.m_seatbelt & 0x3) ~= 0
+	return self:__safecall(false, function()
+		return (self.m_seatbelt & 0x3) ~= 0
+	end)
 end
 
 ---@return float
 function CPed:GetSpeed()
-	if not self:IsValid() then
-		return 0.0
-	end
-
-	local speed_vec = self.m_velocity:get_vec3()
-	return speed_vec:mag()
+	return self:__safecall(0.0, function()
+		return self.m_velocity:get_vec3():mag()
+	end)
 end
 
 ---@return ePedType
 function CPed:GetPedType()
-	return (self.m_ped_type:get_word() << 11 >> 25)
+	return self:__safecall(-1, function()
+		return (self.m_ped_type:get_word() << 11 >> 25)
+	end)
 end
 
 ---@return CPedWeaponManager?
 function CPed:GetWeaponManager()
-	local ptr = self.m_ped_weapon_mgr:deref()
-	if (ptr:is_null()) then
-		self.m_ped_weapon_mgr_inst = nil
-		return
-	end
-
-	local mgr = self.m_ped_weapon_mgr_inst
-	---@diagnostic disable-next-line: invisible
-	if (not mgr or not mgr:IsValid() or (mgr.m_ptr ~= ptr)) then
-		self.m_ped_weapon_mgr_inst = CPedWeaponManager(ptr)
-	end
-
-	return self.m_ped_weapon_mgr_inst
+	return self:__safecall(nil, function()
+		local ptr = self.m_ped_weapon_mgr:deref()
+		if (ptr:is_null()) then
+			self.m_ped_weapon_mgr_inst = nil
+			return nil
+		end
+
+		local mgr = self.m_ped_weapon_mgr_inst
+		---@diagnostic disable-next-line: invisible
+		if (not mgr or not mgr:IsValid() or (mgr.m_ptr ~= ptr)) then
+			self.m_ped_weapon_mgr_inst = CPedWeaponManager(ptr)
+		end
+
+		return self.m_ped_weapon_mgr_inst
+	end)
 end
 
 return CPed