# HG changeset patch # User Asher Baker # Date 1345487038 14400 # Node ID 276192fd70a17793c88bc5267499df51a5582bb7 # Parent 53d15f6faed7f962d7090e854c4e9f51d5fc05af Added META_NO_HL2SDK define to stop MM:S headers using the HL2SDK (bug 5079, r=dvander). diff -r 53d15f6faed7 -r 276192fd70a1 core/ISmmAPI.h --- a/core/ISmmAPI.h Sun Jul 22 09:10:36 2012 -0400 +++ b/core/ISmmAPI.h Mon Aug 20 14:23:58 2012 -0400 @@ -34,8 +34,6 @@ */ #include -#include -#include #include #include #include @@ -52,6 +50,17 @@ #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 + +typedef void* (*CreateInterfaceFn)(const char *pName, int *pReturnCode); + namespace SourceMM { class ISmmPlugin; diff -r 53d15f6faed7 -r 276192fd70a1 core/ISmmPlugin.h --- a/core/ISmmPlugin.h Sun Jul 22 09:10:36 2012 -0400 +++ b/core/ISmmPlugin.h Mon Aug 20 14:23:58 2012 -0400 @@ -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; diff -r 53d15f6faed7 -r 276192fd70a1 core/ISmmPluginExt.h --- a/core/ISmmPluginExt.h Sun Jul 22 09:10:36 2012 -0400 +++ b/core/ISmmPluginExt.h Mon Aug 20 14:23:58 2012 -0400 @@ -28,6 +28,13 @@ #include +// Interface return status, binary-compatible with HL2SDK's IFACE_OK and IFACE_FAILED. +enum +{ + META_IFACE_OK = 0, + META_IFACE_FAILED +}; + /** * @file ISmmPluginExt.h Provides an alternate method for loading plugins, * without needing to include the default headers and all their Half-Life baggage.