Various new functions and changes

* Implement Is*StreamedIn functions
* Implemented most of the SA-MP Actor system
* Finished implementing PVar system
* Changes to class system for consistency with SA-MP
* Change how OnPlayerEnter/ExitVehicle is called (SA-MP's callback behaves like MTA's onVehicleStartEnter/Exit instead)
* Redo ApplyAnimation
* Implement various natives:
  - IsValidVehicle
  - GetPlayerCameraPos
  - GetPlayerCameraFrontVector
  - alias GetConsoleVarAs* funcs with GetServerVarAs* funcs
  - Get/SetVehicleParamsEx
  - Get/SetVehicleParamsCarDoors
  - Get/UpdateVehicleDamageStatus
  - SetVehicleNumberPlate (was a stub before)
  - Get(Player/Vehicle)PoolSize
  - Get(Player/Vehicle)DistanceFromPoint
  - IsPlayerInRangeOfPoint
  - VectorSize
  - Actor natives

Author: AGraber

amx/client/client.lua

@@ -511,9 +511,11 @@ addEventHandler('onClientElementStreamIn', root,
 				vehInfo.blip = createBlipAttachedTo(source, 0, 1, 136, 136, 136, 150, 0, 500)
 				setElementParent(vehInfo.blip, source)
 			end
-			serverAMXEvent('OnVehicleStreamIn', getElemID(source), getElemID(getLocalPlayer()))
+			triggerServerEvent('onAmxClientVehicleStream', g_Me, getElemID(source), true)
 		elseif getElementType(source) == 'player' then
-			serverAMXEvent('OnPlayerStreamIn', getElemID(source), getElemID(getLocalPlayer()))
+			triggerServerEvent('onAmxClientPlayerStream', g_Me, getElemID(source), true)
+		elseif getElementType(source) == 'ped' and getElementData(source, 'amx.actorped') then
+			triggerServerEvent('onAmxClientActorStream', g_Me, getElemID(source), true)
 		end
 	end
 )
@@ -529,9 +531,11 @@ addEventHandler('onClientElementStreamOut', root,
 				end
 				vehInfo.blip = nil
 			end
-			serverAMXEvent('OnVehicleStreamOut', getElemID(source), getElemID(getLocalPlayer()))
+			triggerServerEvent('onAmxClientVehicleStream', g_Me, getElemID(source), false)
 		elseif getElementType(source) == 'player' then
-			serverAMXEvent('OnPlayerStreamOut', getElemID(source), getElemID(getLocalPlayer()))
+			triggerServerEvent('onAmxClientPlayerStream', g_Me, getElemID(source), false)
+		elseif getElementType(source) == 'ped' and getElementData(source, 'amx.actorped') then
+			triggerServerEvent('onAmxClientActorStream', g_Me, getElemID(source), false)
 		end
 	end
 )

amx/server/amx.lua

@@ -8,6 +8,7 @@ g_Objects = {}
 g_Pickups = {}
 g_Markers = {}
 g_SlothBots = {}
+g_Actors = {}
 
 function initGameModeGlobals()
 	g_PlayerClasses = {}
@@ -133,6 +134,7 @@ function loadAMX(fileName, res)
 	amx.markers = {}
 	amx.dbresults = {}
 	amx.slothbots = {}
+	amx.actors = {}
 
 	clientCall(root, 'addAMX', amx.name, amx.type)
 

amx/server/defines.lua

@@ -160,3 +160,10 @@ g_SpecialActions = {
 	[SPECIAL_ACTION_SITTING] = { 'attractors', 'stepsit_loop' },
 	[SPECIAL_ACTION_STOPUSECELLPHONE] = { 'ped', 'phone_out', -1, false, false }
 }
+
+PLAYER_VARTYPE_NONE = 0
+PLAYER_VARTYPE_INT = 1
+PLAYER_VARTYPE_STRING = 2
+PLAYER_VARTYPE_FLOAT = 3
+
+INVALID_ACTOR_ID = 0xFFFF

amx/server/events.lua

@@ -21,6 +21,10 @@ function gameModeInit(player)
 	toggleAllControls(player, false, true, false)
 	clientCall(player, 'showIntroScene')
 	clientCall(player, 'TogglePlayerClock', false, false)
+	g_Players[playerID].pvars = {}
+	g_Players[playerID].streamedActors = {}
+	g_Players[playerID].streamedVehicles = {}
+	g_Players[playerID].streamedPlayers = {}
 	if g_PlayerClasses[0] then
 		g_Players[playerID].viewingintro = true
 		g_Players[playerID].doingclasssel = true
@@ -83,9 +87,6 @@ function joinHandler(player)
 	end
 	g_Players[playerID].updatetimer = setTimer(procCallOnAll, 100, 0, 'OnPlayerUpdate', playerID)
 
-	g_Players[playerID].pvars = {}
-
-
 	if playerJoined then
 		if getRunningGameMode() then
 			gameModeInit(player)
@@ -315,7 +316,17 @@ addEventHandler('onPlayerWasted', root,
 		procCallOnAll('OnPlayerDeath', playerID, killerID, weapon)
 		if g_Players[playerID].returntoclasssel then
 			g_Players[playerID].returntoclasssel = nil
-			setTimer(putPlayerInClassSelection, 3000, 1, source)
+			--setTimer(putPlayerInClassSelection, 3000, 1, source)
+			setTimer(
+				function()
+					g_Players[playerID].spawninfo = nil
+					g_Players[playerID].selectedclass = nil
+					
+					if procCallOnAll('OnPlayerRequestClass', playerID, 0) then
+						putPlayerInClassSelection(player)
+					end
+				end, 3000, 1, source
+			)
 		else
 			setTimer(spawnPlayerBySelectedClass, 3000, 1, source, false)
 		end
@@ -339,6 +350,11 @@ addEventHandler('onPlayerQuit', root,
 			amx.playerobjects[source] = nil
 		end
 		local playerID = getElemID(source)
+
+		for i,playerdata in pairs(g_Players) do
+			playerdata.streamedPlayers[playerID] = nil
+		end
+
 		procCallOnAll('OnPlayerDisconnect', playerID, quitReasons[reason])
 		if g_Players[playerID].blip then
 			destroyElement(g_Players[playerID].blip)
@@ -383,13 +399,11 @@ addEventHandler('onVehicleEnter', root,
 			local pedID = getElemID(player)
 			g_Bots[pedID].vehicle = source
 			setBotState(player, seat == 0 and PLAYER_STATE_DRIVER or PLAYER_STATE_PASSENGER)
-			procCallOnAll('OnBotEnterVehicle', pedID, vehID, seat ~= 0 and 1 or 0)
 			return
 		end
 		local playerID = getElemID(player)
 		g_Players[playerID].vehicle = source
 		setPlayerState(player, seat == 0 and PLAYER_STATE_DRIVER or PLAYER_STATE_PASSENGER)
-		procCallInternal(amx, 'OnPlayerEnterVehicle', playerID, vehID, seat ~= 0 and 1 or 0)
 
 		if amx.vehicles[vehID] and amx.vehicles[vehID].respawntimer then
 			killTimer(amx.vehicles[vehID].respawntimer)
@@ -398,6 +412,23 @@ addEventHandler('onVehicleEnter', root,
 	end
 )
 
+addEventHandler('onVehicleStartEnter', 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)
+			procCallOnAll('OnBotEnterVehicle', pedID, vehID, seat ~= 0 and 1 or 0)
+			return
+		end
+		local playerID = getElemID(player)
+		procCallInternal(amx, 'OnPlayerEnterVehicle', playerID, vehID, seat ~= 0 and 1 or 0)
+	end
+)
+
 addEventHandler('onVehicleExit', root,
 	function(player, seat, jacker)
 		local amx = getElemAMX(source)
@@ -410,13 +441,11 @@ addEventHandler('onVehicleExit', root,
 			local pedID = getElemID(player)
 			g_Bots[pedID].vehicle = nil
 			setBotState(player, PLAYER_STATE_ONFOOT)
-			procCallOnAll('OnBotExitVehicle', pedID, vehID)
 			return
 		end
 
 		local playerID = getElemID(player)
 		g_Players[playerID].vehicle = nil
-		procCallOnAll('OnPlayerExitVehicle', playerID, vehID)
 		setPlayerState(player, PLAYER_STATE_ONFOOT)
 
 		for i=0,getVehicleMaxPassengers(source) do
@@ -433,10 +462,26 @@ addEventHandler('onVehicleExit', root,
 )
 
 addEventHandler('onVehicleStartExit', root,
-	function()
+	function(player, seat, jacked, door)
+		local amx = getElemAMX(source)
+		local vehID = getElemID(source)
+		if not amx then
+			return
+		end
+
 		if g_RCVehicles[getElementModel(source)] then
 			cancelEvent()
+			return
+		end
+
+		if isPed(player) then
+			local pedID = getElemID(player)
+			procCallOnAll('OnBotExitVehicle', pedID, vehID)
+			return
 		end
+
+		local playerID = getElemID(player)
+		procCallOnAll('OnPlayerExitVehicle', playerID, vehID)
 	end
 )
 
@@ -594,3 +639,48 @@ addEventHandler('onPlayerChangeNick', root,
 		cancelEvent()
 	end
 )
+
+-- Actors
+addEvent('onAmxClientActorStream', true)
+addEventHandler('onAmxClientActorStream', root,
+	function(actorId, streamed)
+		local playerID = getElemID(source)
+		if streamed then
+			g_Players[playerID].streamedActors[actorId] = true
+			procCallOnAll('OnActorStreamIn', actorId, playerID)
+		else
+			g_Players[playerID].streamedActors[actorId] = nil
+			procCallOnAll('OnActorStreamOut', actorId, playerID)
+		end
+	end
+)
+
+-- Players
+addEvent('onAmxClientPlayerStream', true)
+addEventHandler('onAmxClientPlayerStream', root,
+	function(otherId, streamed)
+		local playerID = getElemID(source)
+		if streamed then
+			g_Players[playerID].streamedPlayers[otherId] = true
+			procCallOnAll('OnPlayerStreamIn', otherId, playerID)
+		else
+			g_Players[playerID].streamedPlayers[otherId] = nil
+			procCallOnAll('OnPlayerStreamOut', otherId, playerID)
+		end
+	end
+)
+
+-- Vehicles
+addEvent('onAmxClientVehicleStream', true)
+addEventHandler('onAmxClientVehicleStream', root,
+	function(vehicleID, streamed)
+		local playerID = getElemID(source)
+		if streamed then
+			g_Players[playerID].streamedVehicles[vehicleID] = true
+			procCallOnAll('OnVehicleStreamIn', vehicleID, playerID)
+		else
+			g_Players[playerID].streamedVehicles[vehicleID] = nil
+			procCallOnAll('OnVehicleStreamOut', vehicleID, playerID)
+		end
+	end
+)