Decouple pickups and remove some getElemAmx usage

Author: AGraber

amx/server/amx.lua

@@ -120,7 +120,6 @@ function loadAMX(fileName, res)
 
 	g_LoadedAMXs[amx.name] = amx
 
-	amx.pickups = {}
 	amx.objects = {}
 	amx.playerobjects = {}
 	amx.timers = {}
@@ -166,7 +165,13 @@ function destroyGlobalElements()
 		if vehinfo.respawntimer then
 			killTimer(vehinfo.respawntimer)
 			vehinfo.respawntimer = nil
-			removeElem(g_Vehicles, vehinfo.elem)
+		end
+	end
+
+	for i, elemtype in ipairs({g_Vehicles, g_Pickups}) do
+		for id, data in pairs(elemtype) do
+			removeElem(elemtype, data.elem)
+			destroyElement(data.elem)
 		end
 	end
 end
@@ -178,13 +183,14 @@ function unloadAMX(amx, notifyClient)
 		procCallInternal(amx, 'OnGameModeExit')
 		fadeCamera(root, false, 0)
 		ShowPlayerMarkers(amx, false)
+		destroyGlobalElements()
 	elseif amx.type == 'filterscript' then
 		procCallInternal(amx, 'OnFilterScriptExit')
 	end
 
 	amxUnload(amx.cptr)
 
-	for i,elemtype in ipairs({'pickups', 'objects', 'gangzones','bots','markers','textlabels','textdraws'}) do
+	for i,elemtype in ipairs({'objects', 'gangzones','bots','markers','textlabels','textdraws'}) do
 		for id,data in pairs(amx[elemtype]) do
 			removeElem(amx, elemtype, data.elem)
 			destroyElement(data.elem)

amx/server/events.lua

@@ -427,8 +427,7 @@ addEventHandler('onVehicleEnter', root,
 addEventHandler('onVehicleStartEnter', root,
 	function(player, seat, jacked)
 		local vehID = getElemID(source)
-		local amx = getElemAMX(source)
-		if not amx then
+		if not vehID then
 			return
 		end
 		if isPed(player) then
@@ -437,7 +436,7 @@ addEventHandler('onVehicleStartEnter', root,
 			return
 		end
 		local playerID = getElemID(player)
-		procCallInternal(amx, 'OnPlayerEnterVehicle', playerID, vehID, seat ~= 0 and 1 or 0)
+		procCallOnAll('OnPlayerEnterVehicle', playerID, vehID, seat ~= 0 and 1 or 0)
 	end
 )
 
@@ -471,9 +470,8 @@ addEventHandler('onVehicleExit', root,
 
 addEventHandler('onVehicleStartExit', root,
 	function(player, seat, jacked, door)
-		local amx = getElemAMX(source)
 		local vehID = getElemID(source)
-		if not amx then
+		if not vehID then
 			return
 		end
 
@@ -509,9 +507,8 @@ addEventHandler('onVehicleExplode', root,
 
 addEventHandler('onVehicleDamage', root,
 	function(loss)
-		local amx = getElemAMX(source)
 		local vehID = getElemID(source)
-		if not amx then
+		if not vehID then
 			return
 		end
 
@@ -593,8 +590,7 @@ addEventHandler('onPickupUse', root,
 			return
 		end
 
-		local amx = getElemAMX(pickup)
-		procCallInternal(amx, 'OnPlayerPickUpPickup', getElemID(player), getElemID(pickup))
+		procCallOnAll('OnPlayerPickUpPickup', getElemID(player), getElemID(pickup))
 
 		if model == 370 then
 			-- Jetpack pickup

amx/server/syscalls.lua

@@ -201,8 +201,7 @@ function AddPlayerClothes(amx, player, type, index)
 end
 
 local function housePickup()
-	local amx = getElemAMX(source)
-	procCallInternal(amx, 'OnPlayerPickUpPickup', getElemID(player), getElemID(source))
+	procCallOnAll('OnPlayerPickUpPickup', getElemID(player), getElemID(source))
 	cancelEvent()
 end
 function AddStaticPickup(amx, model, type, x, y, z)
@@ -234,7 +233,7 @@ function AddStaticPickup(amx, model, type, x, y, z)
 		-- house pickups don't disappear on pickup
 		addEventHandler('onPickupUse', pickup, housePickup, false)
 	end
-	return addElem(amx, 'pickups', pickup)
+	return addElem(g_Pickups, pickup)
 end
 
 function AddStaticVehicle(amx, model, x, y, z, angle, color1, color2)
@@ -422,7 +421,7 @@ function DestroyObject(amx, object)
 end
 
 function DestroyPickup(amx, pickup)
-	removeElem(amx, 'pickups', pickup)
+	removeElem(g_Pickups, pickup)
 	destroyElement(pickup)
 end