Skip to content

Extend amxx list command #377

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

Merged
Arkshine merged 1 commit into from
Jun 26, 2016
Merged

Extend amxx list command #377

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 22 additions & 13 deletions amxmodx/srvcmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,14 @@
void amx_command()
{
const char* cmd = CMD_ARGV(1);
const char* search = nullptr;
if (CMD_ARGC() > 2)
{
search = CMD_ARGV(2);
// Ignore empty search criteria
if (!(*search))
search = nullptr;
}

if (!strcmp(cmd, "plugins") || !strcmp(cmd, "list"))
{
Expand All @@ -26,11 +34,14 @@ void amx_command()

while (a)
{
++plugins;
if ((*a).isValid() && !(*a).isPaused())
++running;
if (!search || stristr((*a).getTitle(), search) != nullptr || stristr((*a).getName(), search) != nullptr || stristr((*a).getAuthor(), search) != nullptr)
{
++plugins;
if ((*a).isValid() && !(*a).isPaused())
++running;

print_srvconsole(" [%3d] %-23.22s %-11.10s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
print_srvconsole(" [%3d] %-23.22s %-11.10s %-17.16s %-16.15s %-9.8s\n", plugins, (*a).getTitle(), (*a).getVersion(), (*a).getAuthor(), (*a).getName(), (*a).getStatus());
}
++a;
}

Expand All @@ -39,15 +50,13 @@ void amx_command()
int num = 0;
while (a)
{
num++;
if ((*a).getStatusCode() == ps_bad_load)
if (!search || stristr((*a).getTitle(), search) != nullptr || stristr((*a).getName(), search) != nullptr || stristr((*a).getAuthor(), search) != nullptr)
{
//error
print_srvconsole("(%3d) Load fails: %s\n", num, (*a).getError());
}
else if ((*a).getStatusCode() == ps_error) {
//error
print_srvconsole("(%3d) Error: %s\n", num, (*a).getError());
num++;
if ((*a).getStatusCode() == ps_bad_load)
print_srvconsole("(%3d) Load fails: %s\n", num, (*a).getError());
else if ((*a).getStatusCode() == ps_error)
print_srvconsole("(%3d) Error: %s\n", num, (*a).getError());
}
++a;
}
Expand Down Expand Up @@ -237,7 +246,7 @@ void amx_command()
print_srvconsole("Commands:\n");
print_srvconsole(" version - display amxx version info\n");
print_srvconsole(" gpl - print the license\n");
print_srvconsole(" plugins - list plugins currently loaded\n");
print_srvconsole(" plugins [ criteria ] - list plugins currently loaded or ones matching given search criteria\n");
print_srvconsole(" modules - list modules currently loaded\n");
print_srvconsole(" cvars [ plugin ] [ index ] - list cvars handled by amxx or show information about a cvar if index is provided\n");
print_srvconsole(" cmds [ plugin ] - list commands registered by plugins\n");
Expand Down