Exposed IServer through SDKTools (bug 3545, r=ds).

extensions/sdktools/extension.cpp

@@ -38,6 +38,7 @@
 #include "tempents.h"
 #include "vsound.h"
 #include "output.h"
+#include <ISDKTools.h>
 
 #if SOURCE_ENGINE == SE_LEFT4DEAD
 	#define SDKTOOLS_GAME_FILE		"sdktools.games.l4d"
@@ -73,6 +74,7 @@ SourceHook::CallClass<IVEngineServer> *enginePatch = NULL;
 SourceHook::CallClass<IEngineSound> *enginesoundPatch = NULL;
 HandleType_t g_CallHandle = 0;
 HandleType_t g_TraceHandle = 0;
+ISDKTools *g_pSDKTools;
 
 SMEXT_LINK(&g_SdkTools);
 
@@ -84,6 +86,8 @@ extern sp_nativeinfo_t g_VoiceNatives[];
 extern sp_nativeinfo_t g_EntInputNatives[];
 extern sp_nativeinfo_t g_TeamNatives[];
 
+static void InitSDKToolsAPI();
+
 bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 {
 	HandleError err;
@@ -148,6 +152,10 @@ bool SDKTools::SDK_OnLoad(char *error, size_t maxlength, bool late)
 
 	VoiceInit();
 
+	GetIServer();
+
+	InitSDKToolsAPI();
+
 	return true;
 }
 
@@ -255,7 +263,6 @@ void SDKTools::SDK_OnAllLoaded()
 	s_TempEntHooks.Initialize();
 	s_SoundHooks.Initialize();
 	InitializeValveGlobals();
-	GetIServer();
 }
 
 bool SDKTools::QueryRunning(char *error, size_t maxlength)
@@ -379,3 +386,28 @@ bool SDKTools::ProcessCommandTarget(cmd_target_info_t *info)
 
 	return true;
 }
+
+class SDKTools_API : public ISDKTools
+{
+public:
+	virtual const char *GetInterfaceName()
+	{
+		return SMINTERFACE_SDKTOOLS_NAME;
+	}
+
+	virtual unsigned int GetInterfaceVersion()
+	{
+		return SMINTERFACE_SDKTOOLS_VERSION;
+	}
+
+	virtual IServer *GetIServer()
+	{
+		return iserver;
+	}
+} g_SDKTools_API;
+
+static void InitSDKToolsAPI()
+{
+	g_pSDKTools = &g_SDKTools_API;
+	sharesys->AddInterface(myself, g_pSDKTools);
+}

extensions/sdktools/msvc9/sdktools.vcproj

@@ -763,6 +763,10 @@
 				RelativePath="..\extension.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\public\extensions\ISDKTools.h"
+				>
+			</File>
 			<File
 				RelativePath="..\output.h"
 				>