From 68aec7eec0f8a9f67a42305675eae51d4f900821 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Tue, 19 Aug 2014 15:39:06 +0200 Subject: [PATCH] Use new flags in get_players/find_player instead to avoid breakage. --- amxmodx/amxmodx.cpp | 4 ++-- plugins/include/amxmodx.inc | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/amxmodx/amxmodx.cpp b/amxmodx/amxmodx.cpp index 367a6c06..fb78ed6d 100755 --- a/amxmodx/amxmodx.cpp +++ b/amxmodx/amxmodx.cpp @@ -2261,7 +2261,7 @@ static cell AMX_NATIVE_CALL get_players(AMX *amx, cell *params) /* 4 param */ for (int i = 1; i <= gpGlobals->maxClients; ++i) { CPlayer* pPlayer = GET_PLAYER_POINTER_I(i); - if (pPlayer->initialized) + if (((flags & 256) && pPlayer->initialized) || pPlayer->ingame) { if (pPlayer->IsAlive() ? (flags & 2) : (flags & 1)) continue; @@ -2317,7 +2317,7 @@ static cell AMX_NATIVE_CALL find_player(AMX *amx, cell *params) /* 1 param */ { CPlayer* pPlayer = GET_PLAYER_POINTER_I(i); - if (pPlayer->initialized) + if (((flags & 4096) && pPlayer->initialized) || pPlayer->ingame) { if (pPlayer->IsAlive() ? (flags & 64) : (flags & 32)) continue; diff --git a/plugins/include/amxmodx.inc b/plugins/include/amxmodx.inc index 7ca7a418..dd86e3b5 100755 --- a/plugins/include/amxmodx.inc +++ b/plugins/include/amxmodx.inc @@ -1215,6 +1215,7 @@ native get_playersnum(flag=0); * "f" - match with part of name * "g" - match case insensitive * "h" - do not include HLTV proxies + * "i" - include connecting clients * @param team String to match against if the "e" or "f" flag is specified * * @noreturn @@ -1301,8 +1302,10 @@ native get_flags(flags, output[], len); * "j" - return last matched client instead of the first * "k" - match with userid * "l" - match case insensitively + * "m" - include connecting clients * @param ... String to match against (integer if "k" flag is specified) * + * @return Client index, or 0 if no client was found */ native find_player(const flags[], ...);