UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adminhelp.sp -> Switch to the new CommandIterator() (#1388)

Browse Source 
* Switch to the new CommandIterator() methodmap

`ReadCommandIterator` 
->
```
CmdIter.GetName(Name, sizeof(Name));
Flags = CmdIter.Flags;
CmdIter.GetDescription(Desc, sizeof(Desc));
```

* PeaceMaker fixes

* Don't fetch unused properties

Co-authored-by: Michael Flaherty <michaelwflaherty@me.com>
Co-authored-by: Peace-Maker <peace-maker@wcfan.de>
This commit is contained in:
iNilo 2022-02-01 19:13:06 +01:00 committed by GitHub
parent 250dc1b206
commit e5afdb4181
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/adminhelp.sp
View File

@ -86,17 +86,19 @@ public Action HelpCmd(int client, int args)
char Name[64]; char Name[64];
char Desc[255]; char Desc[255];
char NoDesc[128]; char NoDesc[128];
int Flags; CommandIterator CmdIter = new CommandIterator();
Handle CmdIter = GetCommandIterator();
FormatEx(NoDesc, sizeof(NoDesc), "%T", "No description available", client); FormatEx(NoDesc, sizeof(NoDesc), "%T", "No description available", client);
if (DoSearch) if (DoSearch)
{ {
int i = 1; int i = 1;
while (ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc))) while (CmdIter.Next())
{ {
if ((StrContains(Name, arg, false) != -1) && CheckCommandAccess(client, Name, Flags)) CmdIter.GetName(Name, sizeof(Name));
CmdIter.GetDescription(Desc, sizeof(Desc));
if ((StrContains(Name, arg, false) != -1) && CheckCommandAccess(client, Name, CmdIter.Flags))
{ {
PrintToConsole(client, "[%03d] %s - %s", i++, Name, (Desc[0] == '\0') ? NoDesc : Desc); PrintToConsole(client, "[%03d] %s - %s", i++, Name, (Desc[0] == '\0') ? NoDesc : Desc);
} }
@ -114,9 +116,11 @@ public Action HelpCmd(int client, int args)
{ {
int i; int i;
int EndCmd = (PageNum-1) * COMMANDS_PER_PAGE - 1; int EndCmd = (PageNum-1) * COMMANDS_PER_PAGE - 1;
for (i=0; ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && i<EndCmd; ) for (i=0; CmdIter.Next() && i<EndCmd; )
{ {
if (CheckCommandAccess(client, Name, Flags)) CmdIter.GetName(Name, sizeof(Name));
if (CheckCommandAccess(client, Name, CmdIter.Flags))
{ {
i++; i++;
} }
@ -133,9 +137,12 @@ public Action HelpCmd(int client, int args)
/* Start printing the commands to the client */ /* Start printing the commands to the client */
int i; int i;
int StartCmd = (PageNum-1) * COMMANDS_PER_PAGE; int StartCmd = (PageNum-1) * COMMANDS_PER_PAGE;
for (i=0; ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && i<COMMANDS_PER_PAGE; ) for (i=0; CmdIter.Next() && i<COMMANDS_PER_PAGE; )
{ {
if (CheckCommandAccess(client, Name, Flags)) CmdIter.GetName(Name, sizeof(Name));
CmdIter.GetDescription(Desc, sizeof(Desc));
if (CheckCommandAccess(client, Name, CmdIter.Flags))
{ {
i++; i++;
PrintToConsole(client, "[%03d] %s - %s", i+StartCmd, Name, (Desc[0] == '\0') ? NoDesc : Desc); PrintToConsole(client, "[%03d] %s - %s", i+StartCmd, Name, (Desc[0] == '\0') ? NoDesc : Desc);
@ -150,7 +157,7 @@ public Action HelpCmd(int client, int args)
} }
/* Test if there are more commands available */ /* Test if there are more commands available */
if (ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && CheckCommandAccess(client, Name, Flags)) if (CmdIter.Next())
{ {
PrintToConsole(client, "%t", "Type sm_help to see more", PageNum+1); PrintToConsole(client, "%t", "Type sm_help to see more", PageNum+1);
} }