# HG changeset patch # User Asher Baker # Date 1338081368 -3600 # Node ID ba8cd35102b1c6b8235881aeea757a3c021ac991 # Parent 62e002cdecdbbffec28c6da4d3927ff2630905d8 Added META_NO_HL2SDK define to stop MM:S headers using the HL2SDK (bug 5079, r=dvander). diff -r 62e002cdecdb -r ba8cd35102b1 core/ISmmAPI.h --- a/core/ISmmAPI.h Wed Mar 21 21:02:15 2012 -0500 +++ b/core/ISmmAPI.h Sun May 27 02:16:08 2012 +0100 @@ -34,8 +34,6 @@ */ #include -#include -#include #include #include #include @@ -52,6 +50,24 @@ #define MMIFACE_SH_HOOKMANAUTOGEN "IHookManagerAutoGen" /**< SourceHook::IHookManagerAutoGen Pointer */ #define IFACE_MAXNUM 999 /**< Maximum interface version */ +#if defined META_NO_HL2SDK +class CGlobalVars; +class IServerPluginCallbacks; +struct edict_t; +class ConCommandBase; +#else +#include +#endif + +// Interface return status, binary-compatible with HL2SDK's IFACE_OK and IFACE_FAILED. +enum +{ + META_IFACE_OK = 0, + META_IFACE_FAILED +}; + +typedef void* (*CreateInterfaceFn)(const char *pName, int *pReturnCode); + namespace SourceMM { class ISmmPlugin; diff -r 62e002cdecdb -r ba8cd35102b1 core/ISmmPlugin.h --- a/core/ISmmPlugin.h Wed Mar 21 21:02:15 2012 -0500 +++ b/core/ISmmPlugin.h Sun May 27 02:16:08 2012 +0100 @@ -34,7 +34,6 @@ * The pure-virtual ISmmPlugin callbacks must be implemented for the load to load. */ -#include #include #include #include @@ -268,7 +267,7 @@ * wrapper. This can be used to provide interfaces to other plugins or * the GameDLL. * - * If ret is passed, you should fill it with IFACE_OK or IFACE_FAILED. + * If ret is passed, you should fill it with META_IFACE_OK or META_IFACE_FAILED. * * @param iface Interface string. * @param ret Optional pointer to store return code. @@ -279,7 +278,7 @@ { if (ret) { - *ret = IFACE_FAILED; + *ret = META_IFACE_FAILED; } return NULL; @@ -290,7 +289,7 @@ * Metamod:Source's wrapper. This can be used to provide interfaces to * other plugins. * - * If ret is passed, you should fill it with IFACE_OK or IFACE_FAILED. + * If ret is passed, you should fill it with META_IFACE_OK or META_IFACE_FAILED. * * @param iface Interface string. * @param ret Optional pointer to store return code. @@ -301,7 +300,7 @@ { if (ret) { - *ret = IFACE_FAILED; + *ret = META_IFACE_FAILED; } return NULL; @@ -312,7 +311,7 @@ * Metamod:Source's wrapper. This can be used to provide interfaces to * other plugins. * - * If ret is passed, you should fill it with IFACE_OK or IFACE_FAILED. + * If ret is passed, you should fill it with META_IFACE_OK or META_IFACE_FAILED. * * @param iface Interface string. * @param ret Optional pointer to store return code. @@ -323,7 +322,7 @@ { if (ret) { - *ret = IFACE_FAILED; + *ret = META_IFACE_FAILED; } return NULL; @@ -334,7 +333,7 @@ * Metamod:Source's wrapper. This can be used to provide interfaces to * other plugins. * - * If ret is passed, you should fill it with IFACE_OK or IFACE_FAILED. + * If ret is passed, you should fill it with META_IFACE_OK or META_IFACE_FAILED. * * @param iface Interface string. * @param ret Optional pointer to store return code. @@ -345,7 +344,7 @@ { if (ret) { - *ret = IFACE_FAILED; + *ret = META_IFACE_FAILED; } return NULL; @@ -355,7 +354,7 @@ * @brief Called when Metamod's own factory is invoked. * This can be used to provide interfaces to other plugins. * - * If ret is passed, you should fill it with IFACE_OK or IFACE_FAILED. + * If ret is passed, you should fill it with META_IFACE_OK or META_IFACE_FAILED. * * @param iface Interface string. * @param ret Optional pointer to store return code. @@ -366,7 +365,7 @@ { if (ret) { - *ret = IFACE_FAILED; + *ret = META_IFACE_FAILED; } return NULL;