diff -r e023f17b7b73 -r 7d3a2a8d5bf5 sourcemm/CPlugin.h --- a/sourcemm/CPlugin.h Fri Aug 12 17:33:31 2005 +0000 +++ b/sourcemm/CPlugin.h Fri Aug 12 17:33:59 2005 +0000 @@ -21,8 +21,8 @@ #include #include "IPluginManager.h" #include "oslink.h" -#include -#include +#include "smm_list.h" +#include "smm_string.h" /** * History of plugin versions: (M=min, C=current) @@ -30,10 +30,12 @@ * 2: Added GetLogTag() * 3: Moved GetApiVersion() to top (2005-04-16) * 4: Added AllPluginsLoaded() callback (2005-04-18) - * MC 5: Bumped version for SourceHook V4 (2005-05-01) + * 5: Bumped version for SourceHook V4 (2005-05-01) + * 6: Added functions for console printing (2005-05-26) + * MC 7: Changed template libraries (2005-08-11) */ -#define PLAPI_MIN_VERSION 5 +#define PLAPI_MIN_VERSION 6 namespace SourceMM { @@ -52,14 +54,14 @@ CPlugin(); public: PluginId m_Id; - std::string m_File; + String m_File; Pl_Status m_Status; PluginId m_Source; ISmmPlugin *m_API; HINSTANCE m_Lib; factories fac_list; - std::list m_Cvars; - std::list m_Cmds; + List m_Cvars; + List m_Cmds; }; public: CPluginManager(); @@ -100,8 +102,8 @@ bool Retry(PluginId id, char *error, size_t len); //Internal iterators - std::list::iterator _begin(); - std::list::iterator _end(); + List::iterator _begin(); + List::iterator _end(); private: //These are identical internal functions for the wrappers above. CPlugin *_Load(const char *file, PluginId source, char *error, size_t maxlen); @@ -111,12 +113,12 @@ void UnregAllConCmds(CPlugin *pl); private: PluginId m_LastId; - std::list m_Plugins; + List m_Plugins; bool m_AllLoaded; }; }; -typedef std::list::iterator PluginIter; +typedef List::iterator PluginIter; /** @brief Singleton for plugin manager */ extern SourceMM::CPluginManager g_PluginMngr;