1.1 --- a/sourcemm/CPlugin.h Fri Aug 12 17:33:59 2005 +0000
1.2 +++ b/sourcemm/CPlugin.h Fri Aug 12 17:44:53 2005 +0000
1.3 @@ -21,8 +21,8 @@
1.4 #include <convar.h>
1.5 #include "IPluginManager.h"
1.6 #include "oslink.h"
1.7 -#include "smm_list.h"
1.8 -#include "smm_string.h"
1.9 +#include "sh_list.h"
1.10 +#include "sh_string.h"
1.11
1.12 /**
1.13 * History of plugin versions: (M=min, C=current)
1.14 @@ -54,14 +54,14 @@
1.15 CPlugin();
1.16 public:
1.17 PluginId m_Id;
1.18 - String m_File;
1.19 + SourceHook::String m_File;
1.20 Pl_Status m_Status;
1.21 PluginId m_Source;
1.22 ISmmPlugin *m_API;
1.23 HINSTANCE m_Lib;
1.24 factories fac_list;
1.25 - List<ConCommandBase *> m_Cvars;
1.26 - List<ConCommandBase *> m_Cmds;
1.27 + SourceHook::List<ConCommandBase *> m_Cvars;
1.28 + SourceHook::List<ConCommandBase *> m_Cmds;
1.29 };
1.30 public:
1.31 CPluginManager();
1.32 @@ -102,8 +102,8 @@
1.33 bool Retry(PluginId id, char *error, size_t len);
1.34
1.35 //Internal iterators
1.36 - List<SourceMM::CPluginManager::CPlugin *>::iterator _begin();
1.37 - List<SourceMM::CPluginManager::CPlugin *>::iterator _end();
1.38 + SourceHook::List<SourceMM::CPluginManager::CPlugin *>::iterator _begin();
1.39 + SourceHook::List<SourceMM::CPluginManager::CPlugin *>::iterator _end();
1.40 private:
1.41 //These are identical internal functions for the wrappers above.
1.42 CPlugin *_Load(const char *file, PluginId source, char *error, size_t maxlen);
1.43 @@ -113,12 +113,12 @@
1.44 void UnregAllConCmds(CPlugin *pl);
1.45 private:
1.46 PluginId m_LastId;
1.47 - List<CPlugin *> m_Plugins;
1.48 + SourceHook::List<CPlugin *> m_Plugins;
1.49 bool m_AllLoaded;
1.50 };
1.51 };
1.52
1.53 -typedef List<SourceMM::CPluginManager::CPlugin *>::iterator PluginIter;
1.54 +typedef SourceHook::List<SourceMM::CPluginManager::CPlugin *>::iterator PluginIter;
1.55
1.56 /** @brief Singleton for plugin manager */
1.57 extern SourceMM::CPluginManager g_PluginMngr;