Merge pull request #137 from YimMenu-Lua/misc_fixes

Misc fixes

Author: xesdoog

SSV2/includes/backend.lua

@@ -31,10 +31,11 @@ Enums.eEntityType   = {
 	Object  = 3
 }
 
+
 -- Global Singleton.
 ---@class Backend
 ---@field private m_game_branch eGameBranch
-local Backend       = {
+local Backend = {
 	__version                = "",
 	target_build             = "",
 	target_version           = "",
@@ -71,10 +72,13 @@ local Backend       = {
 		[Enums.eEntityType.Vehicle] = 15,
 		[Enums.eEntityType.Object]  = 35,
 	},
+
 	---@type table<string, fun(handle: handle): any>
-	FeatureEntityHandlers    = {}
-}
-Backend.__index     = Backend
+	FeatureEntityHandlers    = {},
+
+	---@type table<int64_t, pointer>
+	AllocatedPointers        = {}
+}; Backend.__index = Backend
 
 ---@param name string
 ---@param script_version string
@@ -418,6 +422,10 @@ end
 function Backend:Cleanup()
 	self:EntitySweep()
 	self:TriggerEventCallbacks(Enums.eBackendEvent.RELOAD_UNLOAD)
+
+	for _, ptr in pairs(self.AllocatedPointers) do
+		free(ptr)
+	end
 end
 
 function Backend:OnSessionSwitch()

SSV2/includes/classes/gta/fVector3.lua

@@ -13,6 +13,15 @@ local __base_fields__ <const> = {
 	z = 0x8
 }
 
+---@param ptr pointer
+local function ptr_to_vec3(ptr)
+	return vec3:new(
+		ptr:add(0x0):get_float(),
+		ptr:add(0x4):get_float(),
+		ptr:add(0x8):get_float()
+	)
+end
+
 --------------------------------------
 -- Class: fVector3
 --------------------------------------
@@ -26,7 +35,7 @@ local __base_fields__ <const> = {
 ---@field public x float
 ---@field public y float
 ---@field public z float
----@field public new fun(ptr: pointer): fVector3 -- static
+---@field public new fun(ptr: pointer): fVector3 -- static func
 ---@field public as_vec3 fun(self: fVector3): vec3 -- method
 ---@overload fun(ptr: pointer): fVector3
 local fVector3 <const> = setmetatable({}, {
@@ -46,13 +55,7 @@ function fVector3:__index(key)
 	end
 
 	if (key == "as_vec3") then
-		return function()
-			return vec3:new(
-				ptr:add(0x0):get_float(),
-				ptr:add(0x4):get_float(),
-				ptr:add(0x8):get_float()
-			)
-		end
+		return ptr_to_vec3(ptr)
 	end
 
 	---@diagnostic disable-next-line: param-type-mismatch

SSV2/includes/classes/gta/rlGamerInfo.lua

@@ -47,11 +47,12 @@ end
 
 ---@return string
 function IPAddress:__tostring()
+	local packed = self.m_packed
 	return _F("%d.%d.%d.%d",
-		self.m_packed.x,
-		self.m_packed.y,
-		self.m_packed.z,
-		self.m_packed.w
+		packed.x,
+		packed.y,
+		packed.z,
+		packed.w
 	)
 end
 

SSV2/includes/data/globals_locals.lua

@@ -22,6 +22,60 @@ return {
 			capture_group = 1
 		}
 	},
+	gpbd_fm_3 = {
+		description = "GPBD_FM_3",
+		file = "freemode.c",
+		LEGACY = {
+			value = 1892653,
+			pattern = [[if\s+\(!MISC::IS_STRING_NULL_OR_EMPTY\(\w+\)\)$\n\s+?\{$\n\s+?TEXT_LABEL_ASSIGN_STRING\(&\(Global_(\d{7})\[.*?/\*(\d+)\*/\]\.f_10\.f_343\), \w+, 64\);]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 615,
+					capture_group = 2,
+					description = "player id size",
+				},
+			}
+		},
+		ENHANCED = {
+			value = 1892798,
+			pattern = [[if\s+\(!MISC::IS_STRING_NULL_OR_EMPTY\(\w+\)\)$\n\s+?\{$\n\s+?TEXT_LABEL_ASSIGN_STRING\(&\(Global_(\d{7})\[.*?/\*(\d+)\*/\]\.f_10\.f_343\), \w+, 64\);]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 615,
+					capture_group = 2,
+					description = "player id size",
+				},
+			}
+		}
+	},
+	freemode_boss_stuff = {
+		description = "freemode global",
+		file = "freemode.c",
+		LEGACY = {
+			value = 2733002,
+			pattern = [[if\s+\(!func_\d+\(4\) && !.*?\(Global_(\d{7})\.f_(\d{3}), 4\)\)]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 925,
+					capture_group = 2,
+				},
+			}
+		},
+		ENHANCED = {
+			value = 2733138,
+			pattern = [[if\s+\(!func_\d+\(4\) && !.*?\(Global_(\d{7})\.f_(\d{3}), 4\)\)]],
+			capture_group = 1,
+			offsets = {
+				{
+					value = 926,
+					capture_group = 2,
+				},
+			}
+		}
+	},
 	freemode_business_global = {
 		description = "Freemode Business Global",
 		file = "freemode.c",

SSV2/includes/data/handling_presets.lua

@@ -15,8 +15,9 @@
 -- On the up side, the raw data will be much more readavle.
 
 
-local CARS_BIT <const>  = Enums.eVehicleType.VEHICLE_TYPE_CAR
-local BIKES_BIT <const> = Enums.eVehicleType.VEHICLE_TYPE_BIKE
+local ALLOW_CARS <const>  = 1 << Enums.eVehicleType.VEHICLE_TYPE_CAR
+local ALLOW_BIKES <const> = 1 << Enums.eVehicleType.VEHICLE_TYPE_BIKE
+local ALLOW_BOTH <const>  = ALLOW_CARS | ALLOW_BIKES
 
 ---@type array<HandlingPresetData>
 return {
@@ -26,39 +27,39 @@ return {
 		is_translator_name = true,
 		auto_apply         = true,
 		deltas             = { [Enums.eHandlingEditorTypes.TYPE_HF] = { ["FREEWHEEL_NO_GAS"] = true } },
-		vehicle_bitset     = 1 << CARS_BIT | 1 << BIKES_BIT,
+		vehicle_bitset     = ALLOW_BOTH,
 	},
 	{
 		name               = "VEH_WHEELIE",
 		description        = "VEH_WHEELIE_TT",
 		is_translator_name = true,
 		auto_apply         = false,
 		deltas             = { [Enums.eHandlingEditorTypes.TYPE_AF] = { ["CAN_WHEELIE"] = true } },
-		vehicle_bitset     = 1 << CARS_BIT,
+		vehicle_bitset     = ALLOW_CARS,
 	},
 	{
 		name               = "VEH_KERS_BOOST",
 		description        = "VEH_KERS_BOOST_TT",
 		is_translator_name = true,
 		auto_apply         = false,
 		deltas             = { [Enums.eHandlingEditorTypes.TYPE_HF] = { ["HAS_KERS"] = true } },
-		vehicle_bitset     = 1 << CARS_BIT
+		vehicle_bitset     = ALLOW_CARS
 	},
 	{
 		name               = "VEH_ROCKET_BOOST",
 		description        = "VEH_ROCKET_BOOST_TT",
 		is_translator_name = true,
 		auto_apply         = false,
 		deltas             = { [Enums.eHandlingEditorTypes.TYPE_MIF] = { ["HAS_ROCKET_BOOST"] = true } },
-		vehicle_bitset     = 1 << CARS_BIT | 1 << BIKES_BIT
+		vehicle_bitset     = ALLOW_BOTH
 	},
 	{
 		name               = "VEH_JUMP",
 		description        = "VEH_JUMP_TT",
 		is_translator_name = true,
 		auto_apply         = false,
 		deltas             = { [Enums.eHandlingEditorTypes.TYPE_MIF] = { ["JUMPING_CAR"] = true, ["HAS_PARACHUTE"] = true, } },
-		vehicle_bitset     = 1 << CARS_BIT
+		vehicle_bitset     = ALLOW_CARS
 	},
 	{
 		name               = "VEH_OFFROAD_ABILITIES",
@@ -83,7 +84,7 @@ return {
 			},
 			[Enums.eHandlingEditorTypes.TYPE_MIF] = { ["INCREASE_LOW_SPEED_TORQUE"] = true, },
 		},
-		vehicle_bitset     = 1 << CARS_BIT
+		vehicle_bitset     = ALLOW_CARS
 	},
 	{
 		name               = "VEH_FORCE_NO_TC",
@@ -104,7 +105,7 @@ return {
 				["DONT_HOLD_LOW_GEARS_WHEN_ENGINE_UNDER_LOAD"] = false,
 			},
 		},
-		vehicle_bitset     = 1 << CARS_BIT | 1 << BIKES_BIT
+		vehicle_bitset     = ALLOW_BOTH
 	},
 	{
 		name               = "VEH_LOW_SPEED_WHEELIE",
@@ -113,7 +114,7 @@ return {
 		auto_apply         = false,
 		deltas             = {
 			[Enums.eHandlingEditorTypes.TYPE_HF] = { ["LOW_SPEED_WHEELIES"] = true } },
-		vehicle_bitset     = 1 << BIKES_BIT
+		vehicle_bitset     = ALLOW_BIKES
 	},
 	{
 		name               = "VEH_RAMP",
@@ -131,6 +132,6 @@ return {
 				["RAMP_MOD"]                                    = true,
 			},
 		},
-		vehicle_bitset     = 1 << CARS_BIT
+		vehicle_bitset     = ALLOW_CARS
 	},
 }

SSV2/includes/data/pointers.lua

@@ -37,10 +37,9 @@ local GPointers = {
 	GameTime         = nullptr,
 	GameVersion      = { build = "", online = "" },
 	ScreenResolution = vec2:zero(),
+	DynamicFuncs     = {}
 }
 
-GPointers.DynamicFuncs = {}
-
 
 ---@class MemoryBatch
 ---@field m_name string

SSV2/includes/data/refs.lua

@@ -457,4 +457,10 @@ return {
 		"Willard",
 		"Zirconium",
 	},
+
+	InteriorIDs = {
+		INTERIOR_ID_OFFICE    = 240641,
+		INTERIOR_ID_CLUBHOUSE = 246273,
+		INTERIOR_ID_HANGAR    = 260353,
+	},
 }

SSV2/includes/data/script_globals.lua

@@ -0,0 +1,43 @@
+-- Copyright (C) 2026 SAMURAI (xesdoog) & Contributors.
+-- This file is part of Samurai's Scripts.
+--
+-- Permission is hereby granted to copy, modify, and redistribute
+-- this code as long as you respect these conditions:
+--	* Credit the owner and contributors.
+--	* Provide a copy of or a link to the original license (GPL-3.0 or later); see LICENSE.md or <https://www.gnu.org/licenses/>.
+
+
+local SGSL = require("includes.services.SGSL")
+
+
+-- No this is not a typo. Double G's my G!
+--
+-- Script globals stored and exposed globally. Can be used for caching as well *(though SGSL already does that)*
+---@class GGlobals
+---@field GPBD_FM_3 ScriptGlobal
+---@field MP_BUSINESS_STUFF ScriptGlobal
+---@field FREEMODE_GLOBAL ScriptGlobal
+local GGlobals                = {}
+GGlobals.__index              = GGlobals
+
+-- Register globals here. Functions will be executed when GGlobals:init is called.
+---@type array<function>
+local GlobalsRegistry <const> = {
+	function()
+		GGlobals.GPBD_FM_3 = SGSL:Get(SGSL.data.gpbd_fm_3):AsGlobal()
+	end,
+	function()
+		GGlobals.MP_BUSINESS_STUFF = SGSL:Get(SGSL.data.mp_business_stuff):AsGlobal()
+	end,
+	function()
+		GGlobals.FREEMODE_GLOBAL = SGSL:Get(SGSL.data.freemode_boss_stuff):AsGlobal()
+	end,
+}
+
+function GGlobals:Init()
+	for _, func in ipairs(GlobalsRegistry) do
+		pcall(func)
+	end
+end
+
+return GGlobals