reHLDS/reapi
2
0
Fork 0
mirror of https://github.com/rehlds/reapi.git synced 2024-12-29 08:05:36 +03:00
Code Issues Projects Releases Wiki Activity

rg_find_ent_by_owner: Change behavior (always start search from next entity)

Browse Source
This commit is contained in:
s1lentq 2024-01-11 23:31:58 +07:00
parent d8045dae93
commit 8fa52b0295
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reapi/extra/amxmodx/scripting/include/reapi_gamedll.inc
View File

@ -443,12 +443,12 @@ native rg_find_ent_by_class(start_index, const classname[], const bool:useHashTa
/* /*
* Finds an entity in the world using Counter-Strike's custom FindEntityByString wrapper, matching by owner. * Finds an entity in the world using Counter-Strike's custom FindEntityByString wrapper, matching by owner.
* *
* @param start_index Entity index to start searching from. -1 to start from the first entity * @param start_index Entity index to start searching from. AMX_NULLENT (-1) to start from the first entity
* @param classname Classname to search for * @param classname Classname to search for
* *
* @return 1 if found, 0 otherwise * @return true if found, false otherwise
*/ */
native rg_find_ent_by_owner(&start_index, const classname[], owner); native bool:rg_find_ent_by_owner(&start_index, const classname[], owner);
/* /*
* Finds the weapon by name in the player's inventory. * Finds the weapon by name in the player's inventory.

12
reapi/src/natives/natives_misc.cpp
View File

@ -613,12 +613,12 @@ cell AMX_NATIVE_CALL rg_find_ent_by_class(AMX *amx, cell *params)
/* /*
* Finds an entity in the world using Counter-Strike's custom FindEntityByString wrapper, matching by owner. * Finds an entity in the world using Counter-Strike's custom FindEntityByString wrapper, matching by owner.
* *
* @param start_index Entity index to start searching from. -1 to start from the first entity * @param start_index Entity index to start searching from. AMX_NULLENT (-1) to start from the first entity
* @param classname Classname to search for * @param classname Classname to search for
* *
* @return 1 if found, 0 otherwise * @return true if found, false otherwise
* *
* native rg_find_ent_by_owner(&start_index, const classname[], owner); * native bool:rg_find_ent_by_owner(&start_index, const classname[], owner);
*/ */
cell AMX_NATIVE_CALL rg_find_ent_by_owner(AMX *amx, cell *params) cell AMX_NATIVE_CALL rg_find_ent_by_owner(AMX *amx, cell *params)
{ {
@ -629,12 +629,14 @@ cell AMX_NATIVE_CALL rg_find_ent_by_owner(AMX *amx, cell *params)
char classname[256]; char classname[256];
cell& startIndex = *getAmxAddr(amx, params[arg_start_index]); cell& startIndex = *getAmxAddr(amx, params[arg_start_index]);
startIndex = clamp(startIndex, AMX_NULLENT, gpGlobals->maxEntities - 1);
const char* value = getAmxString(amx, params[arg_classname], classname); const char* value = getAmxString(amx, params[arg_classname], classname);
edict_t* pOwner = edictByIndexAmx(params[arg_onwer]); edict_t* pOwner = edictByIndexAmx(params[arg_onwer]);
edict_t* pEntity = g_pEdicts + startIndex;
for (int i = startIndex; i < gpGlobals->maxEntities; i++, pEntity++) for (int i = startIndex + 1; i < gpGlobals->maxEntities; i++)
{ {
edict_t *pEntity = edictByIndex(i);
if (pEntity->v.owner != pOwner) if (pEntity->v.owner != pOwner)
continue; continue;