Various changes to get basic scripts running

* Implement Set/GetPVarInt to get rivershell running
* Vehicle IDs now start from 1 instead of 0 (SA-MP behaviour)
* Fix (?) left-right and up-down keys to match what SA-MP scripts expect
* Ignore weaponid -1 in spawninfo (triggers an error otherwise)
* Properly emulate PLAYER_STATE_SPECTATING
* Finish implementing IsPlayerInRangeOfPoint
* Add a pair of stubs to get some basic scripts running

On a side note, grandlarc and rivershell now run unchanged with these changes!

Author: AGraber

amx/server/defines.lua

@@ -99,12 +99,12 @@ g_KeyMapping = setmetatable({
 }, controlMappingMT)
 
 g_LeftRightMapping = setmetatable({
-	[65408] = { 'left', 'vehicle_left' },
+	[-128] = { 'left', 'vehicle_left' },
 	[128] = { 'right', 'vehicle_right' }
 }, controlMappingMT)
 
 g_UpDownMapping = setmetatable({
-	[65408] = { 'forwards', 'accelerate' },
+	[-128] = { 'forwards', 'accelerate' },
 	[128] = { 'backwards', 'brake_reverse' }
 }, controlMappingMT)
 

amx/server/events.lua

@@ -83,6 +83,8 @@ function joinHandler(player)
 	end
 	g_Players[playerID].updatetimer = setTimer(procCallOnAll, 100, 0, 'OnPlayerUpdate', playerID)
 
+	g_Players[playerID].pvars = {}
+
 
 	if playerJoined then
 		if getRunningGameMode() then
@@ -233,7 +235,9 @@ function spawnPlayerBySelectedClass(player, x, y, z, r)
 	end
 	spawnPlayer(player, unpack(spawninfo))
 	for i,weapon in ipairs(spawninfo.weapons) do
-		giveWeapon(player, weapon[1], weapon[2], true)
+		if weapon[1] ~= -1 then
+			giveWeapon(player, weapon[1], weapon[2], true)
+		end
 	end
 	clientCall(player, 'destroyClassSelGUI')
 	if playerdata.blip then

amx/server/syscalls.lua

@@ -748,6 +748,38 @@ function GetPlayerWeapon(amx, player)
 	return getPedWeapon(player)
 end
 
+function GetPVarInt(amx, player, varname)
+	local playerdata = g_Players[getElemID(player)]
+	if playerdata then
+		if not playerdata.pvars then
+			playerdata.pvars = {}
+		end
+		return playerdata.pvars[varname] or 0
+	end
+	return 0
+end
+
+function SetPVarInt(amx, player, varname, value)
+	local playerdata = g_Players[getElemID(player)]
+	if playerdata then
+		if not playerdata.pvars then
+			playerdata.pvars = {}
+		end
+		playerdata.pvars[varname] = value
+		return 1
+	end
+	return 0
+end
+
+-- dummy todo
+function RemoveBuildingForPlayer(amx)
+	return 1; 
+end
+
+function EnableVehicleFriendlyFire(amx)
+	return 1; 
+end
+
 function GetPlayerWeaponData(amx, player, slot, refWeapon, refAmmo)
 	local playerdata = g_Players[getElemID(player)]
 	local weapon = playerdata.weapons and playerdata.weapons[slot]
@@ -1478,12 +1510,20 @@ function TogglePlayerSpectating(amx, player, enable)
 		fadeCamera(player, true)
 		setCameraMatrix(player, 75.461357116699, 64.600051879883, 51.685581207275, 149.75857543945, 131.53228759766, 40.597320556641)
 		setPlayerHudComponentVisible(player, 'radar', false)
+		setPlayerState(player, PLAYER_STATE_SPECTATING)
 	else
+		local playerdata = g_Players[getElemID(player)]
+		local spawninfo = playerdata.spawninfo or (g_PlayerClasses and g_PlayerClasses[playerdata.selectedclass])
+		if not spawninfo then
+			putPlayerInClassSelection(player)
+			return
+		end
 		if isPedDead(player) then
 			spawnPlayerBySelectedClass(player)
 		end
 		setCameraTarget(player, player)
 		setPlayerHudComponentVisible(player, 'radar', true)
+		setPlayerState(player, PLAYER_STATE_ONFOOT)
 	end
 end
 
@@ -2293,7 +2333,7 @@ end
 
 function IsPlayerInRangeOfPoint(amx, player, range, pX, pY, pZ)
 	x, y, z = getElementPosition(player)
-	return true
+	return getDistanceBetweenPoints3D(pX, pY, pZ, getElementPosition(player)) <= range
 end
 
 function GetPlayerSurfingVehicleID(amx, player)
@@ -2437,6 +2477,8 @@ g_SAMPSyscallPrototypes = {
 	GivePlayerMoney = {'p', 'i'},
 	GivePlayerWeapon = {'p', 'i', 'i'},
 
+	GetPVarInt = {'p', 's'},
+
 	HideMenuForPlayer = {'m', 'p'},
 
 	IsPlayerAdmin = {'p'},
@@ -2541,6 +2583,8 @@ g_SAMPSyscallPrototypes = {
 	StopObject = {'o'},
 	StopPlayerObject = {'p', 'i'},
 
+	SetPVarInt = {'p', 's', 'i'},
+
 	TextDrawAlignment = {'x', 'i'},
 	TextDrawBackgroundColor = {'x', 'c'},
 	TextDrawBoxColor = {'x', 'c'},
@@ -2782,4 +2826,8 @@ g_SAMPSyscallPrototypes = {
 	format = {'r', 'i', 's'},
 
 	memcpy = {'r', 'r', 'i', 'i', 'i'},
+
+	-- more dummies
+	EnableVehicleFriendlyFire = {},
+	RemoveBuildingForPlayer = {},
 }

amx/server/util.lua

@@ -346,6 +346,10 @@ 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