sourcemm/concommands.cpp
changeset 29 10e6dc40505e
parent 28 834ab5b0a9cd
child 63 ee7abd0da4dd
     1.1 --- a/sourcemm/concommands.cpp	Tue Apr 19 06:29:27 2005 +0000
     1.2 +++ b/sourcemm/concommands.cpp	Tue Apr 19 07:41:07 2005 +0000
     1.3 @@ -301,34 +301,15 @@
     1.4  			if (args >= 3)
     1.5  			{
     1.6  				int id = atoi(e->Cmd_Argv(2));
     1.7 -				SourceMM::CPluginManager::CPlugin *pl;
     1.8 -
     1.9 -				pl = g_PluginMngr.FindById(id);
    1.10 +				char error[255];
    1.11  
    1.12 -				if (!pl)
    1.13 +				if (!g_PluginMngr.Retry(id, error, sizeof(error)-1))
    1.14  				{
    1.15 -					Msg("Plugin %d not found.\n", id);
    1.16 +					Msg("Error reloading plugin: %s\n", error);
    1.17  					return;
    1.18  				}
    1.19  
    1.20 -				if (pl->m_Status >= Pl_Paused)
    1.21 -				{
    1.22 -					Msg("Plugin %d is already loaded.\n");
    1.23 -					return;
    1.24 -				}
    1.25 -				
    1.26 -				PluginId plid;
    1.27 -				char error[255];
    1.28 -				bool already;
    1.29 -
    1.30 -				plid = g_PluginMngr.Load(pl->m_File.c_str(), Pl_Console, already, error, sizeof(error)-1);
    1.31 -				if (plid < Pl_MinId)
    1.32 -				{
    1.33 -					Msg("Failed to reload plugin %d: (%s).\n", id, error);
    1.34 -					return;
    1.35 -				}
    1.36 -
    1.37 -				Msg("Plugin %d successfully reloaded as plugin %d.\n", id, plid);
    1.38 +				Msg("Plugin %d successfully reloaded.\n", id);
    1.39  
    1.40  				return;
    1.41  			} else {
    1.42 @@ -350,7 +331,7 @@
    1.43  	Msg("  load         - Load a plugin\n");
    1.44  	Msg("  pause        - Pause a running plugin\n");
    1.45  	Msg("  refresh      - Reparse plugins file\n");
    1.46 -	Msg("  retry		- Attempt to reload a plugin\n");
    1.47 +	Msg("  retry        - Attempt to reload a plugin\n");
    1.48  	Msg("  unload       - Unload a loaded plugin\n");
    1.49  	Msg("  unpause      - Unpause a paused plugin\n");
    1.50  	Msg("  version      - Version information\n");