[ConnorMcLeod]

get_players & get_user_team fix




.: Description :.

When you change team, get_user_team() returns the previous team index untill you spawn. This plugin fixes that bug. Should be fixed by amxx dev though...
Also fixes get_players native that by default can return false result with flag "e" and dead players.

.: Modules/Requirements :.

Fakemeta

[GXLZPGX]

Originally Posted by ConnorMcLeod get_user_team() Fix .: Description :. When you change team, get_user_team() returns the previous team index untill you spawn. This plugin fixes that bug. Should be fixed by amxx dev though... .: Modules/Requirements :. Fakemeta

Very nice. Reviewing the code atm.

Edit: I don't see any problems, though I'm not one to listen to, I'm not retarded.

[fezh]

Originally Posted by ConnorMcLeod Should be fixed by amxx dev though...

Indeed. For CS I stick with cs_get_user_team(), but this will be useful for other mods.

[Exolent[jNr]]

Originally Posted by fezh Indeed. For CS I stick with cs_get_user_team(), but this will be useful for other mods.

Won't work in other mods. The pdata offset 114 is CS-specific.

[ConnorMcLeod]

Originally Posted by fezh Indeed. For CS I stick with cs_get_user_team(), but this will be useful for other mods.

Forgot to write (hadn't tested when i posted the plugin) that get_players() native is fixed as well and is more usefull than get_user_team because there is not so efficient alternative.

[fysiks]

Originally Posted by Exolent[jNr] Won't work in other mods. The pdata offset 114 is CS-specific.

I suppose for that same reason you couldn't add a fix for 1.8.2?

[ConnorMcLeod]

Not at all, get_user_team has 2 differents properties, independant one from other.

index (returned) based on ScoreInfo event, and Team Name (optional string param) that is based on TeamInfo event.
Team name is always correct, only index is wrong when you change team when you are dead.

Strangely, get_players and flag "e" (matching with team name) is base on the index ScoreInfo.

I'm not sure at all that i described all how team is handled and i'm not sure that the only problem is when you change your team while dead, but i think it's ok.

When you change team while alive, game first kill you, send a ScoreInfo event with your actual team, then change your team and send a TeamInfo event, that's why index from get_user_team is false at this moment untill a new ScoreInfo event is sent (at spawn).
If you were already dead at the moment you change team, no ScoreInfo event is sent at all.


If you can read amxx sources and see more than me, would be usefull to post a diff.

[Exolent[jNr]]

static cell AMX_NATIVE_CALL get_players(AMX *amx, cell *params) /* 4 param */
{
    int iNum = 0;
    int ilen;
    char* sptemp = get_amxstring(amx, params[3], 0, ilen);
    int flags = UTIL_ReadFlags(sptemp);

    cell *aPlayers = get_amxaddr(amx, params[1]);
    cell *iMax = get_amxaddr(amx, params[2]);

    int team = 0;

    if (flags & 48)
    {
        sptemp = get_amxstring(amx, params[4], 0, ilen);

        if (flags & 16)
        {
            if (flags & 64)
                team = g_teamsIds.findTeamId(sptemp);
            else
                team = g_teamsIds.findTeamIdCase(sptemp);
        }
    }

    for (int i = 1; i <= gpGlobals->maxClients; ++i)
    {
        CPlayer* pPlayer = GET_PLAYER_POINTER_I(i);
        if (pPlayer->ingame)
        {
            if (pPlayer->IsAlive() ? (flags & 2) : (flags & 1))
                continue;
            if (pPlayer->IsBot() ? (flags & 4) : (flags & 8))
                continue;
            if ((flags & 16) && (pPlayer->teamId != team))
                continue;
            if ((flags & 128) && (pPlayer->pEdict->v.flags & FL_PROXY))
                continue;
            if (flags & 32)
            {
                if (flags & 64)
                {
                    if (stristr(pPlayer->name.c_str(), sptemp) == NULL)
                        continue;
                }
                else if (strstr(pPlayer->name.c_str(), sptemp) == NULL)
                    continue;
            }
            aPlayers[iNum++] = i;
        }
    }

    *iMax = iNum;
    
    return 1;
}

Should be:

static cell AMX_NATIVE_CALL get_players(AMX *amx, cell *params) /* 4 param */
{
    typedef int (*STRCOMPARE)(const char*, const char*);
    STRCOMPARE func;
    
    int iNum = 0;
    int ilen;
    char* sptemp = get_amxstring(amx, params[3], 0, ilen);
    int flags = UTIL_ReadFlags(sptemp);

    cell *aPlayers = get_amxaddr(amx, params[1]);
    cell *iMax = get_amxaddr(amx, params[2]);

    if (flags & 48)
    {
        sptemp = get_amxstring(amx, params[4], 0, ilen);
    }
    
    if (flags & 64)
        func = strcasecmp;
    else
        func = strcmp;

    for (int i = 1; i <= gpGlobals->maxClients; ++i)
    {
        CPlayer* pPlayer = GET_PLAYER_POINTER_I(i);
        if (pPlayer->ingame)
        {
            if (pPlayer->IsAlive() ? (flags & 2) : (flags & 1))
                continue;
            if (pPlayer->IsBot() ? (flags & 4) : (flags & 8))
                continue;
            if ((flags & 16) && (func)(pPlayer->team.c_str(), sptemp)
                continue;
            if ((flags & 128) && (pPlayer->pEdict->v.flags & FL_PROXY))
                continue;
            if ((flags & 32) && (func)(pPlayer->name.c_str(), sptemp))
                continue;
            aPlayers[iNum++] = i;
        }
    }

    *iMax = iNum;
    
    return 1;
}

Checks for team name rather than team id, also a bit case sensitivity correction copied from the find_player function's code.

[Alucard^]

Nice for the get_players() flag fix =o

[Fr33m@n]

It would be nice if these modification is added in a new build. But when i see the low numbers of new build...