diff --git a/reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc b/reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc index bb3c7066..edf31f99 100644 --- a/reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc +++ b/reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc @@ -511,7 +511,8 @@ native rg_remove_items_by_slot(const index, const InventorySlotType:slot, const * @param index Client index * @param slot Specific slot for remove of each item. * -* @return 1 on success, 0 otherwise +* @return 1 - successful drop of all items in the slot or the slot is empty +* 0 - if at least one item failed to drop */ native rg_drop_items_by_slot(const index, const InventorySlotType:slot); @@ -529,9 +530,9 @@ native rg_remove_all_items(const index, const bool:removeSuit = false); * Forces the player to drop the specified item classname. * * @param index Client index -* @param item_name Item classname +* @param item_name Item classname, if no name, the active item classname * -* @return 1 on success, 0 otherwise +* @return Entity index of weaponbox, AMX_NULLENT (-1) otherwise * */ native rg_drop_item(const index, const item_name[]); diff --git a/reapi/include/cssdk/dlls/API/CSPlayer.h b/reapi/include/cssdk/dlls/API/CSPlayer.h index 3f63d5c3..b12aa230 100644 --- a/reapi/include/cssdk/dlls/API/CSPlayer.h +++ b/reapi/include/cssdk/dlls/API/CSPlayer.h @@ -64,8 +64,8 @@ class CCSPlayer: public CCSMonster virtual CBaseEntity *GiveNamedItemEx(const char *pszName) = 0; virtual void GiveDefaultItems() = 0; virtual void GiveShield(bool bDeploy = true) = 0; - virtual void DropShield(bool bDeploy = true) = 0; - virtual void DropPlayerItem(const char *pszItemName) = 0; + virtual CBaseEntity *DropShield(bool bDeploy = true) = 0; + virtual CBaseEntity *DropPlayerItem(const char *pszItemName) = 0; virtual bool RemoveShield() = 0; virtual void RemoveAllItems(bool bRemoveSuit) = 0; virtual bool RemovePlayerItem(const char* pszItemName) = 0; diff --git a/reapi/src/natives/natives_misc.cpp b/reapi/src/natives/natives_misc.cpp index ccae232c..ea276784 100644 --- a/reapi/src/natives/natives_misc.cpp +++ b/reapi/src/natives/natives_misc.cpp @@ -942,7 +942,8 @@ cell AMX_NATIVE_CALL rg_remove_items_by_slot(AMX *amx, cell *params) * @param index Client index * @param slot Specific slot for remove of each item. * -* @return 1 on success, 0 otherwise +* @return 1 - successful drop of all items in the slot or the slot is empty +* 0 - if at least one item failed to drop * * native rg_drop_items_by_slot(const index, const InventorySlotType:slot); */ @@ -955,12 +956,14 @@ cell AMX_NATIVE_CALL rg_drop_items_by_slot(AMX *amx, cell *params) CBasePlayer *pPlayer = UTIL_PlayerByIndex(params[arg_index]); CHECK_CONNECTED(pPlayer, arg_index); - pPlayer->ForEachItem(params[arg_slot], [pPlayer](CBasePlayerItem *pItem) { - pPlayer->CSPlayer()->DropPlayerItem(STRING(pItem->pev->classname)); + bool success = true; + + pPlayer->ForEachItem(params[arg_slot], [&](CBasePlayerItem *pItem) { + success &= pPlayer->CSPlayer()->DropPlayerItem(STRING(pItem->pev->classname)) ? true : false; return false; }); - return TRUE; + return success ? TRUE : FALSE; } /* @@ -990,9 +993,9 @@ cell AMX_NATIVE_CALL rg_remove_all_items(AMX *amx, cell *params) * Forces the player to drop the specified item classname. * * @param index Client index -* @param item_name Item classname +* @param item_name Item classname, if no name, the active item classname * -* @return 1 on success, 0 otherwise +* @return Entity index of weaponbox, AMX_NULLENT (-1) otherwise * * native rg_drop_item(const index, const item_name[]); */ @@ -1006,8 +1009,12 @@ cell AMX_NATIVE_CALL rg_drop_item(AMX *amx, cell *params) CHECK_CONNECTED(pPlayer, arg_index); char item[256]; - pPlayer->CSPlayer()->DropPlayerItem(getAmxString(amx, params[arg_item_name], item)); - return TRUE; + auto pEntity = pPlayer->CSPlayer()->DropPlayerItem(getAmxString(amx, params[arg_item_name], item)); + + if (pEntity) + return indexOfPDataAmx(pEntity); + + return AMX_NULLENT; } /*