Perfected weapon switching, I think

This commit is contained in:
Fesiug 2023-12-09 22:47:27 -05:00
parent 7654f49d58
commit 4ab6312ab1
1 changed files with 22 additions and 6 deletions

View File

@ -33,12 +33,28 @@ local function beatup( ply, num )
-- If we are selected our currently equipped weapon, holster it. -- If we are selected our currently equipped weapon, holster it.
return wep:D_SetReqID( hand, "" ) return wep:D_SetReqID( hand, "" )
else else
if id == wep:D_GetID( !hand ) then if wep:D_GetReqID( hand ) != "" then
-- If the wanted weapon is in the other hand, request to holster it. -- Something is in this hand
if wep:D_GetReqID( !hand ) != "" then
-- Something in the other hand
wep:D_SetReqID( !hand, wep:D_GetReqID( hand ) )
wep:D_SetReqID( hand, id )
return
else
-- Nothing in the other hand
wep:D_SetReqID( !hand, "" ) wep:D_SetReqID( !hand, "" )
wep:D_SetReqID( hand, id )
return
end
else
-- Nothing in this hand.
if wep:D_GetReqID( !hand ) == id then
-- Weapon we want is in the other hand.
wep:D_SetReqID( !hand, "" )
wep:D_SetReqID( hand, id )
return
end end
if wep:D_GetID( !hand ) != "" and wep:D_GetID( hand ) != "" then -- If we have something in this hand, swap it with the other
wep:D_SetReqID( !hand, wep:D_GetID( hand ) )
end end
return wep:D_SetReqID( hand, id ) return wep:D_SetReqID( hand, id )
end end