Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions amx/client/client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1750,8 +1750,8 @@ function ShowPlayerDialog(amxName, dialogid, dialogtype, caption, info, button1,
end
end

addEvent ( "onPlayerClickPlayer" )
function OnPlayerClickPlayer ( element )
addEvent("onPlayerClickPlayer")
function OnPlayerClickPlayer(element)
serverAMXEvent('OnPlayerClickPlayer', getElemID(localPlayer), getElemID(element), 0)
end
addEventHandler ( "onPlayerClickPlayer", root, OnPlayerClickPlayer )
addEventHandler("onPlayerClickPlayer", root, OnPlayerClickPlayer)
30 changes: 29 additions & 1 deletion amx/server/syscalls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2942,6 +2942,31 @@ function GetVehicleParamsSirenState(amx, vehicle)
return 0
end
end


-- Weapon
function GetPlayerWeaponState(amx, player)
-- -1 WEAPONSTATE_UNKNOWN
-- 0 WEAPONSTATE_NO_BULLETS
-- 1 WEAPONSTATE_LAST_BULLET
-- 2 WEAPONSTATE_MORE_BULLETS
-- 3 WEAPONSTATE_RELOADING

local vehicle = getPedOccupiedVehicle(player)
if vehicle ~= nil then return -1 end

-- TODO: Function don't return 3 because a isPedReloadingWeapon function only client-side
local ammo = getPedAmmoInClip(player)
if ammo == 0 then
return 0
elseif ammo == 1 then
return 1
elseif ammo >= 2 then
return 2
else
return -1
end
end
-----------------------------------------------------
-- List of the functions and their argument types

Expand Down Expand Up @@ -3523,5 +3548,8 @@ g_SAMPSyscallPrototypes = {
SHA256_PassHash = {'s', 's', 'r', 'i'},

-- siren
GetVehicleParamsSirenState = {'v'}
GetVehicleParamsSirenState = {'v'},


GetPlayerWeaponState = {'p'}
}