Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add precache_player_model #533

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add precache_player_model #533

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a84e1f0
Add precache_player_model
OciXCrom Aug 30, 2018
3e56bba
Use precache_generic for T.mdl and improve replacement
OciXCrom Aug 30, 2018
0b9d9e7
Merge branch 'master' into precache-player-model
OciXCrom Aug 30, 2018
d1e9c0c
-4 to -5
OciXCrom Aug 30, 2018
109837d
Change -5 to charsmax
OciXCrom Aug 30, 2018
f48e728
Use copy instead of replace
OciXCrom Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions plugins/include/amxmisc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,13 +863,41 @@ stock set_task_ex(Float:time, const function[], id = 0, const any:parameter[] =
*
* @noreturn
*/
stock get_players_ex(players[MAX_PLAYERS], &num, GetPlayersFlags:flags = GetPlayers_None, const team[] = "")
stock get_players_ex(players[MAX_PLAYERS] = {}, &num, GetPlayersFlags:flags = GetPlayers_None, const team[] = "")
{
new strFlags[10];
get_flags(_:flags, strFlags, charsmax(strFlags));
get_players(players, num, strFlags, team);
}

/**
* Returns the number of clients on the server that match the specified flags.
*
* @note Example retrieving all alive CTs:
* new AliveCt = get_playersnum_ex(GetPlayers_ExcludeDead | GetPlayers_MatchTeam, "CT")
*
* @param flags Optional filtering flags (enum GetPlayersFlags); valid flags are:
* GetPlayers_None - No filter (Default)
* GetPlayers_ExcludeDead - do not include dead clients
* GetPlayers_ExcludeAlive - do not include alive clients
* GetPlayers_ExcludeBots - do not include bots
* GetPlayers_ExcludeHuman - do not include human clients
* GetPlayers_MatchTeam - match with team
* GetPlayers_MatchNameSubstring - match with part of name
* GetPlayers_CaseInsensitive - match case insensitive
* GetPlayers_ExcludeHLTV - do not include HLTV proxies
* GetPlayers_IncludeConnecting - include connecting clients
* @param team String to match against if the GetPlayers_MatchTeam or GetPlayers_MatchNameSubstring flag is specified
*
* @return Number of clients on the server that match the specified flags
*/
stock get_playersnum_ex(GetPlayersFlags:flags = GetPlayers_None, const team[] = "")
{
new PlayersNum;
get_players_ex(_, PlayersNum, flags, team);
return PlayersNum;
}

/**
* Precaches a player model file.
*
Expand All @@ -891,8 +919,8 @@ stock precache_player_model(const name[], &id = 0)
formatex(model, charsmax(model), "models/player/%s/%sT.mdl", name, name);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some models have t.mdl instead of T.mdl, this can be a problem on OS with case-sensitive filesystem (like Linux) rehlds/ReHLDS@6715402.


if(file_exists(model))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the way how it should be checked, you need to check if model really needs it rehlds/ReHLDS@9080b9b#diff-462e3f794ed90c12c86f5d8d5b725c4aR5405.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WPMGPRoSToTeMa Which I assume can't be done with a stock?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@OciXCrom it can be done through the reading of model file.

id = precache_model(model);
id = precache_generic(model);

replace_string(model, charsmax(model), "T.mdl", ".mdl");
replace_string(model[strlen(model) - 4], charsmax(model), "T.mdl", ".mdl");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not the best option, magic 4 should be replaced with something like sizeof("T.mdl") - 1. But anyway replace_string doesn't fit good for me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WPMGPRoSToTeMa I changed it to charsmax because sizeof would output 6 instead.

What do you suggest using instead replace_string? I couldn't figure out a way to manually insert a character without using functions.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@OciXCrom copy maybe.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WPMGPRoSToTeMa I changed it to copy.

return precache_model(model);
}
}