UNLOZE/sm-plugins
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "entWatch4: Drop Ammo aswell, when force drops happen."

Browse Source 
This reverts commit b09777159a.
This commit is contained in:
zaCade 2019-04-25 18:04:17 +02:00
parent b09777159a
commit 9a199c8efa
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_entWatch4/scripting/entWatch-core.sp
View File

@ -420,7 +420,7 @@ public void OnClientDisconnect(int client)
{ {
if (item.bWeapon && !(item.dConfig.iSlot == SLOT_NONE || item.dConfig.iSlot == SLOT_KNIFE)) if (item.bWeapon && !(item.dConfig.iSlot == SLOT_NONE || item.dConfig.iSlot == SLOT_KNIFE))
{ {
Client_DropWeapon(item.iClient, item.iWeapon); SDKHooks_DropWeapon(item.iClient, item.iWeapon, NULL_VECTOR, NULL_VECTOR);
} }
item.iClient = INVALID_ENT_REFERENCE; item.iClient = INVALID_ENT_REFERENCE;
@ -451,7 +451,7 @@ public void OnClientDeath(Event hEvent, const char[] sEvent, bool bDontBroadcast
{ {
if (item.bWeapon && !(item.dConfig.iSlot == SLOT_NONE || item.dConfig.iSlot == SLOT_KNIFE)) if (item.bWeapon && !(item.dConfig.iSlot == SLOT_NONE || item.dConfig.iSlot == SLOT_KNIFE))
{ {
Client_DropWeapon(item.iClient, item.iWeapon); SDKHooks_DropWeapon(item.iClient, item.iWeapon, NULL_VECTOR, NULL_VECTOR);
} }
item.iClient = INVALID_ENT_REFERENCE; item.iClient = INVALID_ENT_REFERENCE;

2
_entWatch4/scripting/entWatch-tools.sp
View File

@ -76,7 +76,7 @@ public Action Command_TransferItem(int client, int args)
{ {
if (item.bWeapon && !(item.dConfig.iSlot == SLOT_NONE || item.dConfig.iSlot == SLOT_KNIFE)) if (item.bWeapon && !(item.dConfig.iSlot == SLOT_NONE || item.dConfig.iSlot == SLOT_KNIFE))
{ {
Client_DropWeapon(item.iClient, item.iWeapon); SDKHooks_DropWeapon(item.iClient, item.iWeapon, NULL_VECTOR, NULL_VECTOR);
char sWeaponClass[32]; char sWeaponClass[32];
GetEntityClassname(item.iWeapon, sWeaponClass, sizeof(sWeaponClass)); GetEntityClassname(item.iWeapon, sWeaponClass, sizeof(sWeaponClass));

24
_entWatch4/scripting/include/entWatch_helpers.inc
View File

@ -69,30 +69,6 @@ stock int Client_GetObserverTarget(int client)
return GetEntPropEnt(client, Prop_Send, "m_hObserverTarget"); return GetEntPropEnt(client, Prop_Send, "m_hObserverTarget");
} }
/**
* Drops a client's weapon.
*
* @param client Client Index.
* @param weapon Weapon Index.
* @noreturn
*/
stock void Client_DropWeapon(int client, int weapon)
{
int iPrimaryAmmoType = GetEntProp(weapon, Prop_Data, "m_iPrimaryAmmoType");
int iSecondaryAmmoType = GetEntProp(weapon, Prop_Data, "m_iSecondaryAmmoType");
int iAmmoPrimary = GetEntProp(client, Prop_Send, "m_iAmmo", _, iPrimaryAmmoType);
int iAmmoSecondary = GetEntProp(client, Prop_Send, "m_iAmmo", _, iSecondaryAmmoType);
SetEntProp(client, Prop_Send, "m_iAmmo", 0, _, iPrimaryAmmoType);
SetEntProp(client, Prop_Send, "m_iAmmo", 0, _, iSecondaryAmmoType);
SDKHooks_DropWeapon(client, weapon, NULL_VECTOR, NULL_VECTOR);
SetEntProp(weapon, Prop_Data, "m_iPrimaryAmmoCount", iAmmoPrimary);
SetEntProp(weapon, Prop_Data, "m_iSecondaryAmmoCount", iAmmoSecondary);
}
/* /*
* Checks if an entity is valid and exists. * Checks if an entity is valid and exists.
* *