1.1 --- a/sourcemm/concommands.cpp Tue Sep 18 20:03:47 2007 +0000
1.2 +++ b/sourcemm/concommands.cpp Tue Sep 18 20:35:29 2007 +0000
1.3 @@ -15,6 +15,9 @@
1.4 #include "sh_string.h"
1.5 #include "sh_list.h"
1.6
1.7 +using namespace SourceMM;
1.8 +using namespace SourceHook;
1.9 +
1.10 /**
1.11 * @brief Console Command Implementations
1.12 * @file concommands.cpp
1.13 @@ -50,15 +53,41 @@
1.14
1.15 void SMConVarAccessor::MarkCommandsAsGameDLL()
1.16 {
1.17 - for (SourceHook::List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
1.18 + for (List<ConCommandBase*>::iterator iter = m_RegisteredCommands.begin();
1.19 iter != m_RegisteredCommands.end(); ++iter)
1.20 {
1.21 (*iter)->AddFlags(FCVAR_GAMEDLL);
1.22 }
1.23 }
1.24
1.25 -void SMConVarAccessor::Unregister(ConCommandBase *pCommand)
1.26 +void SMConVarAccessor::Unregister(PluginId id, ConCommandBase *pCommand)
1.27 {
1.28 + /* Notify via IMetamodListener */
1.29 + PluginIter iter;
1.30 + CPluginManager::CPlugin *pPlugin;
1.31 + List<IMetamodListener *>::iterator event;
1.32 + IMetamodListener *pML;
1.33 + for (iter=g_PluginMngr._begin(); iter!=g_PluginMngr._end(); iter++)
1.34 + {
1.35 + pPlugin = (*iter);
1.36 + if (pPlugin->m_Status < Pl_Paused)
1.37 + {
1.38 + continue;
1.39 + }
1.40 + /* Only valid for plugins >= 12 (v1:6, SourceMM 1.5) */
1.41 + if (pPlugin->m_API->GetApiVersion() < 12)
1.42 + {
1.43 + continue;
1.44 + }
1.45 + for (event=pPlugin->m_Events.begin();
1.46 + event!=pPlugin->m_Events.end();
1.47 + event++)
1.48 + {
1.49 + pML = (*event);
1.50 + pML->OnUnlinkConCommandBase(id, pCommand);
1.51 + }
1.52 + }
1.53 +
1.54 ICvar *cv = g_Engine.icvar;
1.55 ConCommandBase *ptr = cv->GetCommands();
1.56
1.57 @@ -154,7 +183,7 @@
1.58 CONMSG(" Description: %s\n", g_GameDll.pGameDLL->GetGameDescription());
1.59 CONMSG(" Mod Path: %s\n", g_ModPath.c_str());
1.60 CONMSG(" DLL Path: %s\n", g_BinPath.c_str());
1.61 - CONMSG(" Interface: ServerGameDLL%03d\n", g_GameDllVersion);
1.62 + CONMSG(" Interface: ServerGameDLL%03d, ServerGameClients%03d\n", g_GameDllVersion, g_GameClientsVersion);
1.63
1.64 // Display user messages
1.65 if (g_SmmAPI.MsgCacheSuccessful())
1.66 @@ -191,65 +220,63 @@
1.67
1.68 return;
1.69 } else if (strcmp(command, "list") == 0) {
1.70 - SourceMM::CPluginManager::CPlugin *pl;
1.71 + CPluginManager::CPlugin *pl;
1.72 + ISmmPlugin *plapi;
1.73 + const char *plname;
1.74 PluginIter i;
1.75 - const char *status="";
1.76 - const char *version=NULL;
1.77 - const char *name=NULL;
1.78 - const char *author=NULL;
1.79 + char buffer[256];
1.80 + int len;
1.81 + int plnum = g_PluginMngr.GetPluginCount();
1.82
1.83 - CONMSG("-Id- %-20.19s %-10.9s %-20.19s %-8.7s\n", "Name", "Version", "Author", "Status");
1.84 - for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
1.85 + if (!plnum)
1.86 + {
1.87 + CONMSG("No plugins loaded.\n");
1.88 + return;
1.89 + } else {
1.90 + CONMSG("Listing %d plugin%s:\n", plnum, (plnum > 1) ? "s" : "");
1.91 + }
1.92 +
1.93 + for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++)
1.94 {
1.95 pl = (*i);
1.96 if (!pl)
1.97 - break;
1.98 - if (pl->m_Status == Pl_Paused)
1.99 {
1.100 - status = "PAUSE";
1.101 - } else if (pl->m_Status == Pl_Running) {
1.102 - if (pl->m_API && pl->m_API->QueryRunning(NULL, 0))
1.103 - status = "RUN";
1.104 - else
1.105 - status = "STOPPED";
1.106 - } else if (pl->m_Status == Pl_Refused) {
1.107 - status = "FAIL";
1.108 - } else if (pl->m_Status == Pl_Error) {
1.109 - status = "ERROR";
1.110 - } else if (pl->m_Status == Pl_NotFound) {
1.111 - status = "NOFILE";
1.112 + break;
1.113 + }
1.114 +
1.115 + len = 0;
1.116 +
1.117 + if (pl->m_Status != Pl_Running)
1.118 + {
1.119 + len += UTIL_Format(buffer, sizeof(buffer), " [%02d] <%s>", pl->m_Id, g_PluginMngr.GetStatusText(pl));
1.120 + } else {
1.121 + len += UTIL_Format(buffer, sizeof(buffer), " [%02d]", pl->m_Id);
1.122 }
1.123
1.124 - if (pl->m_API)
1.125 + if ((plapi = pl->m_API))
1.126 {
1.127 - version = pl->m_API->GetVersion();
1.128 - author = pl->m_API->GetAuthor();
1.129 - name = pl->m_API->GetName();
1.130 - } else {
1.131 - version = "-";
1.132 - author = "-";
1.133 - name = "-";
1.134 + plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str();
1.135 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname);
1.136 +
1.137 + if (IS_STR_FILLED(plapi->GetVersion()))
1.138 + {
1.139 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion());
1.140 + }
1.141 + if (IS_STR_FILLED(plapi->GetAuthor()))
1.142 + {
1.143 + UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor());
1.144 + }
1.145 }
1.146
1.147 - if (!version)
1.148 - version = "-";
1.149 - if (!author)
1.150 - author = "-";
1.151 - if (!name)
1.152 - name = pl->m_File.c_str();
1.153 -
1.154 -
1.155 - CONMSG("[%02d] %-20.19s %-10.9s %-20.19s %-8.7s\n", pl->m_Id, name, version, author, status);
1.156 + CONMSG("%s\n", buffer);
1.157 }
1.158
1.159 - //CONMSG("\n");
1.160 -
1.161 return;
1.162 } else if (strcmp(command, "cmds") == 0) {
1.163 if (args >= 3)
1.164 {
1.165 int id = atoi(e->Cmd_Argv(2));
1.166 - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
1.167 + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
1.168
1.169 if (!pl)
1.170 {
1.171 @@ -262,7 +289,7 @@
1.172 CONMSG("Plugin %d is not loaded.\n", id);
1.173 } else {
1.174 CONMSG("Console commands for %s:\n", pl->m_API->GetName());
1.175 - SourceHook::List<ConCommandBase *>::iterator ci;
1.176 + List<ConCommandBase *>::iterator ci;
1.177 size_t count = 0;
1.178
1.179 for (ci=pl->m_Cmds.begin(); ci!=pl->m_Cmds.end(); ci++)
1.180 @@ -280,7 +307,7 @@
1.181 if (args >= 3)
1.182 {
1.183 int id = atoi(e->Cmd_Argv(2));
1.184 - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
1.185 + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
1.186
1.187 if (!pl)
1.188 {
1.189 @@ -293,7 +320,7 @@
1.190 CONMSG("Plugin %d is not loaded.\n", id);
1.191 } else {
1.192 CONMSG("Registered cvars for %s:\n", pl->m_API->GetName());
1.193 - SourceHook::List<ConCommandBase *>::iterator ci;
1.194 + List<ConCommandBase *>::iterator ci;
1.195 size_t count = 0;
1.196
1.197 for (ci=pl->m_Cvars.begin(); ci!=pl->m_Cvars.end(); ci++)
1.198 @@ -311,7 +338,7 @@
1.199 if (args >= 3)
1.200 {
1.201 int id = atoi(e->Cmd_Argv(2));
1.202 - SourceMM::CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
1.203 + CPluginManager::CPlugin *pl = g_PluginMngr.FindById(id);
1.204 if (!pl)
1.205 {
1.206 CONMSG("Plugin %d not found.\n", id);
1.207 @@ -420,7 +447,7 @@
1.208
1.209 char error[255]={0};
1.210 bool already;
1.211 - SourceMM::CPluginManager::CPlugin *pl;
1.212 + CPluginManager::CPlugin *pl;
1.213
1.214 PluginId id = g_PluginMngr.Load(full_path, Pl_Console, already, error, sizeof(error));
1.215 pl = g_PluginMngr.FindById(id);
1.216 @@ -467,8 +494,8 @@
1.217 CONMSG("Alias \"%s\" was not found.\n", alias);
1.218 }
1.219 } else {
1.220 - SourceHook::List<SourceMM::CNameAlias *>::iterator iter, end;
1.221 - SourceMM::CNameAlias *p;
1.222 + List<CNameAlias *>::iterator iter, end;
1.223 + CNameAlias *p;
1.224
1.225 iter = g_PluginMngr._alias_begin();
1.226 end = g_PluginMngr._alias_end();
1.227 @@ -521,8 +548,8 @@
1.228 g_SmmAPI.PathFormat(full_path, sizeof(full_path), "%s/%s%s", g_ModPath.c_str(), file, ext);
1.229 }
1.230
1.231 - SourceHook::List<SourceMM::CPluginManager::CPlugin *>::iterator iter, end;
1.232 - SourceMM::CPluginManager::CPlugin *pl;
1.233 + List<CPluginManager::CPlugin *>::iterator iter, end;
1.234 + CPluginManager::CPlugin *pl;
1.235 iter = g_PluginMngr._begin();
1.236 end = g_PluginMngr._end();
1.237 for (; iter!=end; iter++)
1.238 @@ -703,43 +730,47 @@
1.239
1.240 RETURN_META(MRES_SUPERCEDE);
1.241 } else if(strcmp(subcmd, "list") == 0) {
1.242 - SourceMM::CPluginManager::CPlugin *pl;
1.243 - Pl_Status st;
1.244 + CPluginManager::CPlugin *pl;
1.245 + ISmmPlugin *plapi;
1.246 + const char *plname;
1.247 PluginIter i;
1.248 - const char *version = NULL;
1.249 - const char *name = NULL;
1.250 - const char *author = NULL;
1.251 - const char *status = NULL;
1.252 + char buffer[256];
1.253 + int len = 0;
1.254 + int plnum = 0;
1.255
1.256 - CLIENT_CONMSG(client, "-Id- %-20.19s %-10.9s %-20.19s %6s\n", "Name", "Version", "Author", "Status");
1.257 -
1.258 - for (i=g_PluginMngr._begin(); i!=g_PluginMngr._end(); i++)
1.259 + for (i = g_PluginMngr._begin(); i != g_PluginMngr._end(); i++, len=0)
1.260 {
1.261 pl = (*i);
1.262 - if (!pl)
1.263 - break;
1.264 -
1.265 - st = pl->m_Status;
1.266 -
1.267 - /* Only show plugins that are running or paused */
1.268 - if (pl->m_API && (st == Pl_Running || st == Pl_Paused))
1.269 + if (pl && pl->m_Status == Pl_Running)
1.270 {
1.271 - version = pl->m_API->GetVersion();
1.272 - author = pl->m_API->GetAuthor();
1.273 - name = pl->m_API->GetName();
1.274 + plapi = pl->m_API;
1.275 + if (!plapi || !plapi->QueryRunning(NULL, 0))
1.276 + {
1.277 + continue;
1.278 + }
1.279 + plnum++;
1.280 +
1.281 + len += UTIL_Format(buffer, sizeof(buffer), " [%02d]", plnum);
1.282
1.283 - if (st == Pl_Running && pl->m_API->QueryRunning(NULL, 0))
1.284 + plname = IS_STR_FILLED(plapi->GetName()) ? plapi->GetName() : pl->m_File.c_str();
1.285 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " %s", plname);
1.286 +
1.287 + if (IS_STR_FILLED(plapi->GetVersion()))
1.288 {
1.289 - status = "RUN";
1.290 - } else {
1.291 - status = "PAUSE";
1.292 + len += UTIL_Format(&buffer[len], sizeof(buffer)-len, " (%s)", plapi->GetVersion());
1.293 + }
1.294 + if (IS_STR_FILLED(plapi->GetAuthor()))
1.295 + {
1.296 + UTIL_Format(&buffer[len], sizeof(buffer)-len, " by %s", plapi->GetAuthor());
1.297 }
1.298
1.299 - if (!version || !author || !name)
1.300 - break;
1.301 + CLIENT_CONMSG(client, "%s\n", buffer);
1.302 + }
1.303 + }
1.304
1.305 - CLIENT_CONMSG(client, "[%02d] %-20.19s %-10.9s %-20.19s %6s\n", pl->m_Id, name, version, author, status);
1.306 - }
1.307 + if (!plnum)
1.308 + {
1.309 + CLIENT_CONMSG(client, "No active plugins loaded.\n");
1.310 }
1.311
1.312 RETURN_META(MRES_SUPERCEDE);