From 2aa3cbe4c7006859ada5ddfa7fa0f80bb157959b Mon Sep 17 00:00:00 2001 From: M60TM <96904513+M60TM@users.noreply.github.com> Date: Tue, 13 Feb 2024 18:16:29 +0900 Subject: [PATCH 1/2] Fixed tag mismatch in `Items_IsHoldingWeapon` - `Items_GetWeaponByIndex` returns bool. --- addons/sourcemod/scripting/scp_sf/items.sp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/sourcemod/scripting/scp_sf/items.sp b/addons/sourcemod/scripting/scp_sf/items.sp index 5d9f242..e193af2 100644 --- a/addons/sourcemod/scripting/scp_sf/items.sp +++ b/addons/sourcemod/scripting/scp_sf/items.sp @@ -1174,8 +1174,7 @@ bool Items_IsHoldingWeapon(int client) { WeaponEnum weapon; - int index = Items_GetWeaponByIndex(GetEntProp(entity, Prop_Send, "m_iItemDefinitionIndex"), weapon); - if(!index) + if(!Items_GetWeaponByIndex(GetEntProp(entity, Prop_Send, "m_iItemDefinitionIndex"), weapon)) return true; if ((weapon.Type == ITEM_TYPE_WEAPON) || (weapon.Type == ITEM_TYPE_GRENADE)) From c537e2a8f0570775350dccf5c2dbab145a1883b4 Mon Sep 17 00:00:00 2001 From: M60TM <96904513+M60TM@users.noreply.github.com> Date: Tue, 13 Feb 2024 18:23:22 +0900 Subject: [PATCH 2/2] Fix undefined symbol "index" --- addons/sourcemod/scripting/scp_sf/items.sp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/sourcemod/scripting/scp_sf/items.sp b/addons/sourcemod/scripting/scp_sf/items.sp index e193af2..aeac6f5 100644 --- a/addons/sourcemod/scripting/scp_sf/items.sp +++ b/addons/sourcemod/scripting/scp_sf/items.sp @@ -1174,9 +1174,10 @@ bool Items_IsHoldingWeapon(int client) { WeaponEnum weapon; - if(!Items_GetWeaponByIndex(GetEntProp(entity, Prop_Send, "m_iItemDefinitionIndex"), weapon)) + int index = GetEntProp(entity, Prop_Send, "m_iItemDefinitionIndex"); + if(!Items_GetWeaponByIndex(index, weapon)) return true; - + if ((weapon.Type == ITEM_TYPE_WEAPON) || (weapon.Type == ITEM_TYPE_GRENADE)) return true;