GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2025-03-15 15:10:22 +03:00
Code Issues Projects Releases Wiki Activity

Remove unneeded looping and add one more message

Browse Source
This commit is contained in:
OciXCrom 2018-08-10 13:56:37 +02:00
parent 74c27c3654
commit 761cf035b3
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/include/targetex.inc
View File

@ -81,6 +81,9 @@ static const Targetex_Teams[][TargetexTeams] =
* except the admin that used the command. * except the admin that used the command.
* @note The "name" argument is used to store the matched client's name * @note The "name" argument is used to store the matched client's name
* or one of the translations found in the targetex.txt dictionary. * or one of the translations found in the targetex.txt dictionary.
* If only one client is matched, the "name" argument will be equal
* to the matched client's name, otherwise it will contain a translated
* string which you can directly add in your message by using %s.
* *
* @param id Client index of admin performing an action * @param id Client index of admin performing an action
* @param arg Target pattern * @param arg Target pattern
@ -133,7 +136,10 @@ stock cmd_targetex(id, const arg[], players[MAX_PLAYERS], name[], len, TargetexF
} }
} }
else if(bExceptMe) else if(bExceptMe)
{
console_print(id, "%L", id, "TARGETEX_NO_EXCEPT", arg);
return 0; return 0;
}
new iPlayers[MAX_PLAYERS], iPnum; new iPlayers[MAX_PLAYERS], iPnum;
new szMatchingString[10], GetPlayersFlags:iMatchingFlags, iMatchedPlayers; new szMatchingString[10], GetPlayersFlags:iMatchingFlags, iMatchedPlayers;
@ -146,7 +152,7 @@ stock cmd_targetex(id, const arg[], players[MAX_PLAYERS], name[], len, TargetexF
if(flags & TARGETEX_NO_BOTS) if(flags & TARGETEX_NO_BOTS)
iMatchingFlags |= GetPlayers_ExcludeBots|GetPlayers_ExcludeHLTV; iMatchingFlags |= GetPlayers_ExcludeBots|GetPlayers_ExcludeHLTV;
new szLangKey[32], szSuffix[6], iArgLen = strlen(arg) new szLangKey[32], szSuffix[6], iArgLen = strlen(arg);
new iArgLen2 = iArgLen - (bExceptMe ? 1 : 0); new iArgLen2 = iArgLen - (bExceptMe ? 1 : 0);
for(new i; i < sizeof(Targetex_Teams); i++) for(new i; i < sizeof(Targetex_Teams); i++)
@ -161,13 +167,11 @@ stock cmd_targetex(id, const arg[], players[MAX_PLAYERS], name[], len, TargetexF
{ {
copy(szLangKey, charsmax(szLangKey), "TARGETEX_ARG_ALL"); copy(szLangKey, charsmax(szLangKey), "TARGETEX_ARG_ALL");
get_players_ex(iPlayers, iPnum, iMatchingFlags, szMatchingString); get_players_ex(iPlayers, iPnum, iMatchingFlags, szMatchingString);
goto @AFTER_ARGS;
} }
} }
} }
if(szLangKey[0])
goto @AFTER_ARGS;
if(equal(arg[iStartArg], "aim", 3)) if(equal(arg[iStartArg], "aim", 3))
{ {
new iTarget, iBody; new iTarget, iBody;

1
plugins/lang/targetex.txt
View File

@ -5,6 +5,7 @@ TARGETEX_NO_BOTS = This command cannot be used on bots.
TARGETEX_NO_ALIVE = Alive players cannot be targeted with this command. TARGETEX_NO_ALIVE = Alive players cannot be targeted with this command.
TARGETEX_NO_DEAD = Dead players cannot be targeted with this command. TARGETEX_NO_DEAD = Dead players cannot be targeted with this command.
TARGETEX_NO_MATCHES = No players were found matching your criteria. TARGETEX_NO_MATCHES = No players were found matching your criteria.
TARGETEX_NO_EXCEPT = You cannot exclude yourself when using @%s.
TARGETEX_EXCEPT_HIMSELF = except him TARGETEX_EXCEPT_HIMSELF = except him
TARGETEX_ARG_ALL = all players TARGETEX_ARG_ALL = all players