diff --git a/amxmodx/srvcmd.cpp b/amxmodx/srvcmd.cpp index 79ccd306..86a98cab 100755 --- a/amxmodx/srvcmd.cpp +++ b/amxmodx/srvcmd.cpp @@ -29,200 +29,231 @@ * version. */ -#include -#include #include "amxmodx.h" void amx_command(){ - - const char* cmd = CMD_ARGV(1); - - if (!strcmp(cmd,"plugins") || !strcmp(cmd,"list")) - { - - print_srvconsole( "Currently loaded plugins:\n"); - print_srvconsole( " %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", - "name","version","author","file","status"); - - int plugins = 0; - int running = 0; - - - CPluginMngr::iterator a = g_plugins.begin(); - while (a) - { - ++plugins; - - if ( (*a).isValid() && !(*a).isPaused() ) - ++running; - - print_srvconsole( " [%3d] %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", - plugins,(*a).getTitle(),(*a).getVersion(), - (*a).getAuthor(), (*a).getName(), (*a).getStatus() ); - - ++a; - } - - print_srvconsole( "%d plugins, %d running\n",plugins,running ); - - } - else if (!strcmp(cmd,"pause") && CMD_ARGC() > 2) - { - const char* sPlugin = CMD_ARGV(2); - - CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin); - - if ( plugin && plugin->isValid() ) - { - plugin->pausePlugin(); - print_srvconsole("Paused plugin \"%s\"\n",plugin->getName() ); - } - else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin); - - } - else if (!strcmp(cmd,"unpause") && CMD_ARGC() > 2) - { - const char* sPlugin = CMD_ARGV(2); - - CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin); - - if ( plugin && plugin->isValid() ) - { - plugin->unpausePlugin(); - print_srvconsole("Unpaused plugin \"%s\"\n",plugin->getName() ); - } - else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin); - - } - else if (!strcmp(cmd,"cvars")) - { - print_srvconsole( "Registered cvars:\n"); - print_srvconsole( " %-24.23s %-24.23s %-16.15s\n", - "name","value","plugin"); - - int ammount = 0; - - for( CList::iterator a = g_cvars.begin(); a ; ++a ) - { - print_srvconsole( " [%3d] %-24.23s %-24.23s %-16.15s\n",++ammount, - (*a).getName() ,CVAR_GET_STRING( (*a).getName() ),(*a).getPluginName() ); - } - - print_srvconsole( "%d cvars\n",ammount); - } - else if ( !strcmp(cmd,"cmds") ) - { + const char* cmd = CMD_ARGV(1); - print_srvconsole( "Registered commands:\n"); - print_srvconsole( " %-24.23s %-16.15s %-8.7s %-16.15s\n", - "name","access" ,"type" ,"plugin"); - - int ammount = 0; - - char access[32]; - - CmdMngr::iterator a = g_commands.begin( CMD_ConsoleCommand ); - - while( a ) + if (!strcmp(cmd,"plugins") || !strcmp(cmd,"list")) { - UTIL_GetFlags( access , (*a).getFlags() ); - print_srvconsole( " [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n", - ++ammount,(*a).getCmdLine() , access , (*a).getCmdType() , (*a).getPlugin()->getName()); - ++a; + + print_srvconsole( "Currently loaded plugins:\n"); + print_srvconsole( " %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", + "name","version","author","file","status"); + + int plugins = 0; + int running = 0; + + + CPluginMngr::iterator a = g_plugins.begin(); + + while (a) + { + ++plugins; + + if ( (*a).isValid() && !(*a).isPaused() ) + ++running; + + print_srvconsole( " [%3d] %-18.17s %-8.7s %-17.16s %-16.15s %-9.8s\n", + plugins,(*a).getTitle(),(*a).getVersion(), + (*a).getAuthor(), (*a).getName(), (*a).getStatus() ); + + ++a; + } + + print_srvconsole( "%d plugins, %d running\n",plugins,running ); + } - - print_srvconsole( "%d commands\n",ammount); - } - else if (!strcmp(cmd,"version")) - { - - print_srvconsole( "%s %s\n", Plugin_info.name, Plugin_info.version); - print_srvconsole( "author: %s (%s)\n", Plugin_info.author, Plugin_info.url); - print_srvconsole( "compiled: %s\n", __DATE__ ", " __TIME__); - - } - else if (!strcmp(cmd,"modules")) - { - print_srvconsole( "Currently loaded modules:\n"); - print_srvconsole( " %-23.22s %-7.8s %-8.7s %-20.19s %-11.10s\n", - "name","type","version", "author", "status"); - - int running = 0; - int modules = 0; - - CList::iterator a = g_modules.begin(); - - while ( a ) + else if (!strcmp(cmd,"pause") && CMD_ARGC() > 2) { - if ( (*a).getStatusValue() == MODULE_LOADED ) - ++running; + const char* sPlugin = CMD_ARGV(2); - ++modules; + CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin); + + if ( plugin && plugin->isValid() ) + { + plugin->pausePlugin(); + print_srvconsole("Paused plugin \"%s\"\n",plugin->getName() ); + } + else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin); - print_srvconsole( " [%2d] %-23.22s %-7.6s %-8.7s %-20.19s %-11.10s\n",modules, - (*a).getName(), (*a).getType(), (*a).getVersion(), (*a).getAuthor() , (*a).getStatus() ); - - ++a; } + else if (!strcmp(cmd,"unpause") && CMD_ARGC() > 2) + { + const char* sPlugin = CMD_ARGV(2); - print_srvconsole( "%d modules, %d correct\n",modules,running); - } - else - { + CPluginMngr::CPlugin *plugin = g_plugins.findPlugin(sPlugin); + + if ( plugin && plugin->isValid() ) + { + plugin->unpausePlugin(); + print_srvconsole("Unpaused plugin \"%s\"\n",plugin->getName() ); + } + else print_srvconsole("Couldn't find plugin matching \"%s\"\n",sPlugin); + + } + else if (!strcmp(cmd,"cvars")) + { + print_srvconsole( "Registered cvars:\n"); + print_srvconsole( " %-24.23s %-24.23s %-16.15s\n", + "name","value","plugin"); + + int ammount = 0; + + for( CList::iterator a = g_cvars.begin(); a ; ++a ) + { + print_srvconsole( " [%3d] %-24.23s %-24.23s %-16.15s\n",++ammount, + (*a).getName() ,CVAR_GET_STRING( (*a).getName() ),(*a).getPluginName() ); + } + + print_srvconsole( "%d cvars\n",ammount); + } + else if ( !strcmp(cmd,"cmds") ) + { + + print_srvconsole( "Registered commands:\n"); + print_srvconsole( " %-24.23s %-16.15s %-8.7s %-16.15s\n", + "name","access" ,"type" ,"plugin"); + + int ammount = 0; + + char access[32]; + + CmdMngr::iterator a = g_commands.begin( CMD_ConsoleCommand ); + + while( a ) + { + UTIL_GetFlags( access , (*a).getFlags() ); + print_srvconsole( " [%3d] %-24.23s %-16.15s %-8.7s %-16.15s\n", + ++ammount,(*a).getCmdLine() , access , (*a).getCmdType() , (*a).getPlugin()->getName()); + ++a; + } + + print_srvconsole( "%d commands\n",ammount); + } + else if (!strcmp(cmd,"version")) + { + + print_srvconsole( "%s %s\n", Plugin_info.name, Plugin_info.version); + print_srvconsole( "author: %s (%s)\n", Plugin_info.author, Plugin_info.url); + print_srvconsole( "compiled: %s\n", __DATE__ ", " __TIME__); + + } + else if (!strcmp(cmd,"modules")) + { + print_srvconsole( "Currently loaded modules:\n"); + print_srvconsole( " %-23.22s %-7.8s %-8.7s %-20.19s %-11.10s\n", + "name","type","version", "author", "status"); + + int running = 0; + int modules = 0; + + CList::iterator a = g_modules.begin(); + + while ( a ) + { + if ( (*a).getStatusValue() == MODULE_LOADED ) + ++running; + + ++modules; + + print_srvconsole( " [%2d] %-23.22s %-7.6s %-8.7s %-20.19s %-11.10s\n",modules, + (*a).getName(), (*a).getType(), (*a).getVersion(), (*a).getAuthor() , (*a).getStatus() ); + + ++a; + } + + print_srvconsole( "%d modules, %d correct\n",modules,running); + } + else if (!strcmp(cmd, "gpl")) + { + print_srvconsole("AMX Mod X\n"); + print_srvconsole("\n"); + print_srvconsole(" by the AMX Mod X Development Team\n"); + print_srvconsole(" originally developed by OLO\n"); + print_srvconsole("\n"); + print_srvconsole("\n"); + print_srvconsole(" This program is free software; you can redistribute it and/or modify it\n"); + print_srvconsole(" under the terms of the GNU General Public License as published by the\n"); + print_srvconsole(" Free Software Foundation; either version 2 of the License, or (at\n"); + print_srvconsole(" your option) any later version.\n"); + print_srvconsole("\n"); + print_srvconsole(" This program is distributed in the hope that it will be useful, but\n"); + print_srvconsole(" WITHOUT ANY WARRANTY; without even the implied warranty of\n"); + print_srvconsole(" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n"); + print_srvconsole(" General Public License for more details.\n"); + print_srvconsole("\n"); + print_srvconsole(" You should have received a copy of the GNU General Public License\n"); + print_srvconsole(" along with this program; if not, write to the Free Software Foundation,\n"); + print_srvconsole(" Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\n"); + print_srvconsole("\n"); + print_srvconsole(" In addition, as a special exception, the author gives permission to\n"); + print_srvconsole(" link the code of this program with the Half-Life Game Engine (\"HL\n"); + print_srvconsole(" Engine\") and Modified Game Libraries (\"MODs\") developed by Valve,\n"); + print_srvconsole(" L.L.C (\"Valve\"). You must obey the GNU General Public License in all\n"); + print_srvconsole(" respects for all of the code used other than the HL Engine and MODs\n"); + print_srvconsole(" from Valve. If you modify this file, you may extend this exception\n"); + print_srvconsole(" to your version of the file, but you are not obligated to do so. If\n"); + print_srvconsole(" you do not wish to do so, delete this exception statement from your\n"); + print_srvconsole(" version.\n"); + print_srvconsole("\n"); + } + else + { - print_srvconsole("Usage: amxx < command > [ argument ]\n"); - print_srvconsole("Commands:\n"); - print_srvconsole(" version - display amxx version info\n"); - print_srvconsole(" plugins - list plugins currently loaded\n"); - print_srvconsole(" modules - list modules currently loaded\n"); - print_srvconsole(" cvars - list cvars registered by plugins\n"); - print_srvconsole(" cmds - list commands registered by plugins\n"); - print_srvconsole(" pause < plugin > - pause a running plugin\n"); - print_srvconsole(" unpause < plugin > - unpause a previously paused plugin\n"); + print_srvconsole("Usage: amxx < command > [ argument ]\n"); + print_srvconsole("Commands:\n"); + print_srvconsole(" version - display amxx version info\n"); + print_srvconsole(" plugins - list plugins currently loaded\n"); + print_srvconsole(" modules - list modules currently loaded\n"); + print_srvconsole(" cvars - list cvars registered by plugins\n"); + print_srvconsole(" cmds - list commands registered by plugins\n"); + print_srvconsole(" pause < plugin > - pause a running plugin\n"); + print_srvconsole(" unpause < plugin > - unpause a previously paused plugin\n"); - - } + + } } void plugin_srvcmd() { - cell ret = 0; - int err; - const char* cmd = CMD_ARGV(0); - + cell ret = 0; + int err; + const char* cmd = CMD_ARGV(0); + #ifdef ENABLEEXEPTIONS - try{ + try{ #endif - - CmdMngr::iterator a = g_commands.srvcmdbegin(); - - while ( a ) + + CmdMngr::iterator a = g_commands.srvcmdbegin(); + + while ( a ) + { + if ( (*a).matchCommand( cmd ) && + (*a).getPlugin()->isExecutable( (*a).getFunction() ) ) + { + + if ((err = amx_Exec( (*a).getPlugin()->getAMX(), &ret , (*a).getFunction() + , 3 , g_srvindex , (*a).getFlags() , (*a).getId() )) != AMX_ERR_NONE) + + AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", + err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName()); + + if ( ret ) break; + } + + ++a; + } + +#ifdef ENABLEEXEPTIONS + }catch( ... ) { - if ( (*a).matchCommand( cmd ) && - (*a).getPlugin()->isExecutable( (*a).getFunction() ) ) - { - - if ((err = amx_Exec( (*a).getPlugin()->getAMX(), &ret , (*a).getFunction() - , 3 , g_srvindex , (*a).getFlags() , (*a).getId() )) != AMX_ERR_NONE) - - AMXXLOG_Log("[AMXX] Run time error %d on line %ld (plugin \"%s\")", - err,(*a).getPlugin()->getAMX()->curline,(*a).getPlugin()->getName()); - - if ( ret ) break; - } - - ++a; + AMXXLOG_Log( "[AMXX] fatal error at forward function execution"); } - -#ifdef ENABLEEXEPTIONS - }catch( ... ) - { - AMXXLOG_Log( "[AMXX] fatal error at forward function execution"); - } #endif - + }