Decouple vehicles from AMX instances

Author: AGraber

amx/client/client.lua

@@ -22,8 +22,19 @@ local BOATS = {
 	[454] = true
 }
 
+local defaultEmptyTableMt = {
+	__index = function(t, k)
+		local info = {}
+		t[k] = info
+		return t[k]
+	end
+}
+
 g_AMXs = {}
 
+g_Vehicles = {}
+setmetatable(g_Vehicles, defaultEmptyTableMt)
+
 local screenWidth, screenHeight = guiGetScreenSize()
 
 addEventHandler('onClientResourceStart', resourceRoot,
@@ -49,16 +60,6 @@ end
 function addAMX(name, type)
 	g_AMXs[name] = { name = name, type = type, vehicles = {}, playerobjects = {}, textdraws = {}, textlabels = {}, menus = {}, blips = {} }
 	-- textdraws = { id = { text = text, color = color, align = 1|2|3, x = x, y = y, boxsize = {width, height}, parts={{x=x,y=y,color=color,text=text},...} }, ... }
-	setmetatable(
-		g_AMXs[name].vehicles,
-		{
-			__index = function(t, k)
-				local vehInfo = {}
-				t[k] = vehInfo
-				return t[k]
-			end
-		}
-	)
 	if type == 'gamemode' then
 		setTime(12, 0)
 	end
@@ -589,11 +590,11 @@ function SetPlayerPosFindZ(amxName, x, y, z)
 end
 
 function SetVehicleParamsForPlayer(vehicle, isObjective, doorsLocked)
-	local amx, vehID = getElemAMX(vehicle), getElemID(vehicle)
-	if not amx or not vehID then
+	local vehID = getElemID(vehicle)
+	if not vehID then
 		return
 	end
-	local vehInfo = amx.vehicles[vehID]
+	local vehInfo = g_Vehicles[vehID]
 	if isObjective then
 		if vehInfo.blip then
 			destroyElement(vehInfo.blip)
@@ -672,8 +673,8 @@ addEventHandler('onClientElementStreamIn', root,
 				vehicleDrops[source] = { timer = timer, tries = 0 }
 			end
 
-			local amx, vehID = getElemAMX(source), getElemID(source)
-			local vehInfo = amx and vehID and amx.vehicles[vehID]
+			local vehID = getElemID(source)
+			local vehInfo = vehID and g_Vehicles[vehID]
 			if vehInfo and not vehInfo.blip then
 				vehInfo.blip = createBlipAttachedTo(source, 0, 1, 136, 136, 136, 150, 0, 500)
 				setElementParent(vehInfo.blip, source)
@@ -690,8 +691,8 @@ addEventHandler('onClientElementStreamIn', root,
 addEventHandler('onClientElementStreamOut', root,
 	function()
 		if getElementType(source) ~= 'vehicle' then
-			local amx, vehID = getElemAMX(source), getElemID(source)
-			local vehInfo = amx and vehID and amx.vehicles[vehID]
+			local vehID = getElemID(source)
+			local vehInfo = vehID and g_Vehicles[vehID]
 			if vehInfo and vehInfo.blip and not vehInfo.blippersistent then
 				if isElement(vehInfo.blip) then
 					destroyElement(vehInfo.blip)
@@ -717,7 +718,7 @@ addEventHandler('onClientVehicleStartEnter', root,
 )
 
 function DestroyVehicle(amxName, vehID)
-	g_AMXs[amxName].vehicles[vehID] = nil
+	g_Vehicles[vehID] = nil
 end
 
 -----------------------------

amx/server/amx.lua

@@ -121,7 +121,6 @@ function loadAMX(fileName, res)
 	g_LoadedAMXs[amx.name] = amx
 
 	amx.pickups = {}
-	amx.vehicles = {}
 	amx.objects = {}
 	amx.playerobjects = {}
 	amx.timers = {}
@@ -162,6 +161,16 @@ function loadAMX(fileName, res)
 end
 addEvent('onAMXStart')
 
+function destroyGlobalElements()
+	for i,vehinfo in pairs(g_Vehicles) do
+		if vehinfo.respawntimer then
+			killTimer(vehinfo.respawntimer)
+			vehinfo.respawntimer = nil
+			removeElem(g_Vehicles, vehinfo.elem)
+		end
+	end
+end
+
 function unloadAMX(amx, notifyClient)
 	outputDebugString('Unloading ' .. amx.name .. '.amx')
 
@@ -175,20 +184,13 @@ function unloadAMX(amx, notifyClient)
 
 	amxUnload(amx.cptr)
 
-	for i,elemtype in ipairs({'pickups', 'vehicles', 'objects', 'gangzones','bots','markers','textlabels','textdraws'}) do
+	for i,elemtype in ipairs({'pickups', 'objects', 'gangzones','bots','markers','textlabels','textdraws'}) do
 		for id,data in pairs(amx[elemtype]) do
 			removeElem(amx, elemtype, data.elem)
 			destroyElement(data.elem)
 		end
 	end
 
-	for i,vehinfo in pairs(amx.vehicles) do
-		if vehinfo.respawntimer then
-			killTimer(vehinfo.respawntimer)
-			vehinfo.respawntimer = nil
-		end
-	end
-
 	table.each(amx.timers, killTimer)
 	table.each(amx.files, fileClose)
 

amx/server/events.lua

@@ -385,26 +385,22 @@ function respawnStaticVehicle(vehicle)
 	if not isElement(vehicle) then
 		return
 	end
-	local amx, vehID = getElemAMX(vehicle), getElemID(vehicle)
-	if not amx or not amx.vehicles[vehID] then
+	local vehID = getElemID(vehicle)
+	if not g_Vehicles[vehID] then
 		return
 	end
-	if isTimer(amx.vehicles[vehID].respawntimer) then
-		killTimer(amx.vehicles[vehID].respawntimer)
+	if isTimer(g_Vehicles[vehID].respawntimer) then
+		killTimer(g_Vehicles[vehID].respawntimer)
 	end
-	amx.vehicles[vehID].respawntimer = nil
-	local spawninfo = amx.vehicles[vehID].spawninfo
+	g_Vehicles[vehID].respawntimer = nil
+	local spawninfo = g_Vehicles[vehID].spawninfo
 	spawnVehicle(vehicle, spawninfo.x, spawninfo.y, spawninfo.z, 0, 0, spawninfo.angle)
 	procCallInternal(amx, 'OnVehicleSpawn', vehID)
 end
 
 addEventHandler('onVehicleEnter', root,
 	function(player, seat, jacked)
 		local vehID = getElemID(source)
-		local amx = getElemAMX(source)
-		if not amx then
-			return
-		end
 		if isPed(player) then
 			local pedID = getElemID(player)
 			g_Bots[pedID].vehicle = source
@@ -415,14 +411,14 @@ addEventHandler('onVehicleEnter', root,
 		g_Players[playerID].vehicle = source
 		setPlayerState(player, seat == 0 and PLAYER_STATE_DRIVER or PLAYER_STATE_PASSENGER)
 
-		if amx.vehicles[vehID] and amx.vehicles[vehID].respawntimer then
-			killTimer(amx.vehicles[vehID].respawntimer)
-			amx.vehicles[vehID].respawntimer = nil
+		if g_Vehicles[vehID] and g_Vehicles[vehID].respawntimer then
+			killTimer(g_Vehicles[vehID].respawntimer)
+			g_Vehicles[vehID].respawntimer = nil
 		end
 
 		if ManualVehEngineAndLights then
 			if (getVehicleType(source) ~= "Plane" and getVehicleType(source) ~= "Helicopter") then
-				setVehicleEngineState(source, amx.vehicles[vehID].engineState)
+				setVehicleEngineState(source, g_Vehicles[vehID].engineState)
 			end
 		end
 	end
@@ -447,11 +443,7 @@ addEventHandler('onVehicleStartEnter', root,
 
 addEventHandler('onVehicleExit', root,
 	function(player, seat, jacker)
-		local amx = getElemAMX(source)
 		local vehID = getElemID(source)
-		if not amx then
-			return
-		end
 
 		if isPed(player) then
 			local pedID = getElemID(player)
@@ -469,11 +461,11 @@ addEventHandler('onVehicleExit', root,
 				return
 			end
 		end
-		if amx.vehicles[vehID] and amx.vehicles[vehID].respawntimer then
-			killTimer(amx.vehicles[vehID].respawntimer)
-			amx.vehicles[vehID].respawntimer = nil
+		if g_Vehicles[vehID] and g_Vehicles[vehID].respawntimer then
+			killTimer(g_Vehicles[vehID].respawntimer)
+			g_Vehicles[vehID].respawntimer = nil
 		end
-		amx.vehicles[vehID].respawntimer = setTimer(respawnStaticVehicle, amx.vehicles[vehID].respawndelay, 1, source)
+		g_Vehicles[vehID].respawntimer = setTimer(respawnStaticVehicle, g_Vehicles[vehID].respawndelay, 1, source)
 	end
 )
 
@@ -503,19 +495,15 @@ addEventHandler('onVehicleStartExit', root,
 
 addEventHandler('onVehicleExplode', root,
 	function()
-		local amx = getElemAMX(source)
 		local vehID = getElemID(source)
-		if not amx then
-			return
-		end
 
 		procCallOnAll('OnVehicleDeath', vehID, 0)		-- NOES, MY VEHICLE DIED
 
-		if amx.vehicles[vehID].respawntimer then
-			killTimer(amx.vehicles[vehID].respawntimer)
-			amx.vehicles[vehID].respawntimer = nil
+		if g_Vehicles[vehID].respawntimer then
+			killTimer(g_Vehicles[vehID].respawntimer)
+			g_Vehicles[vehID].respawntimer = nil
 		end
-		amx.vehicles[vehID].respawntimer = setTimer(respawnStaticVehicle, amx.vehicles[vehID].respawndelay, 1, source)
+		g_Vehicles[vehID].respawntimer = setTimer(respawnStaticVehicle, g_Vehicles[vehID].respawndelay, 1, source)
 	end
 )
 

amx/server/syscalls.lua

@@ -253,19 +253,19 @@ function AddStaticVehicleEx(amx, model, x, y, z, angle, color1, color2, respawnD
 
 		setVehicleColor(vehicle, color1, color2, 0, 0)
 	end
-	local vehID = addElem(amx, 'vehicles', vehicle)
+	local vehID = addElem(g_Vehicles, vehicle)
 	if respawnDelay < 0 then
 		respawnDelay = 120
 	end
-	amx.vehicles[vehID].respawndelay = respawnDelay*1000
-	amx.vehicles[vehID].spawninfo = { x = x, y = y, z = z, angle = angle }
+	g_Vehicles[vehID].respawndelay = respawnDelay*1000
+	g_Vehicles[vehID].spawninfo = { x = x, y = y, z = z, angle = angle }
 	if ManualVehEngineAndLights then
 		if (getVehicleType(vehicle) ~= "Plane" and getVehicleType(vehicle) ~= "Helicopter") then
 			setVehicleEngineState(vehicle, false)
 			for i=0, 4 do
 				setVehicleLightState(vehicle, i, 0)
 			end
-			amx.vehicles[vehID].engineState = false
+			g_Vehicles[vehID].engineState = false
 		end
 	end
 	return vehID
@@ -433,7 +433,7 @@ end
 
 function DestroyVehicle(amx, vehicle)
 	clientCall(root, 'DestroyVehicle', amx.name, getElemID(vehicle))
-	removeElem(amx, 'vehicles', vehicle)
+	removeElem(g_Vehicles, vehicle)
 	local vehicleID = getElemID(vehicle)
 	for i,playerdata in pairs(g_Players) do
 		playerdata.streamedVehicles[vehicleID] = nil

amx/server/util.lua

@@ -348,10 +348,6 @@ function addElem(amx, listname, elem)
 		globList = _G['g_' .. listname:sub(1, 1):upper() .. listname:sub(2)]
 		if globList then
 			id = 0
-			-- vehicles in sa-mp start at ID 1
-			if listname == 'vehicles' then
-				id = 1
-			end
 			while globList[id] do
 				id = id + 1
 			end
@@ -361,6 +357,12 @@ function addElem(amx, listname, elem)
 
 	if not id then
 		id = 0
+
+		-- vehicles in sa-mp start at ID 1
+		if list == g_Vehicles then
+			id = 1
+		end
+
 		while list[id] do
 			id = id + 1
 		end