From 4b75bcb43187a49a63cadc75b605692ad51ee230 Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Thu, 9 Jul 2015 13:15:41 -0400
Subject: [PATCH] Renamed s2 -> source2.

---
 AMBuildScript          | 10 +++---
 loader/loader_bridge.h | 70 ------------------------------------------
 2 files changed, 5 insertions(+), 75 deletions(-)
 delete mode 100644 loader/loader_bridge.h

diff --git a/AMBuildScript b/AMBuildScript
index 4f50230..2ece4a1 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -38,7 +38,7 @@ PossibleSDKs = {
   'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '19', 'INSURGENCY', WinLinuxMac, 'insurgency'),
   'contagion':  SDK('HL2SDKCONTAGION', '2.contagion', '14', 'CONTAGION', WinOnly, 'contagion'),
   'bms':  SDK('HL2SDKBMS', '2.bms', '10', 'BMS', WinLinux, 'bms'),
-  's2': SDK('HL2SDKS2', '2.s2', '22', 'SOURCE2', WinOnly, 's2'),
+  'source2': SDK('HL2SDKS2', '2.s2', '22', 'SOURCE2', WinOnly, 'source2'),
 }
 
 def ResolveEnvPath(env, folder):
@@ -282,7 +282,7 @@ class MMSConfig(object):
     else:
       compiler.defines += ['COMPILER_GCC']
 
-    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota', 's2']:
+    if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota', 'source2']:
       if builder.target_platform in ['linux', 'mac']:
         compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
 
@@ -339,7 +339,7 @@ class MMSConfig(object):
       else:
         compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a'))]
 
-      if sdk.name in ['blade', 'insurgency', 'csgo', 'dota', 's2']:
+      if sdk.name in ['blade', 'insurgency', 'csgo', 'dota', 'source2']:
         compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
 
     binary = self.LibraryBuilder(compiler, name)
@@ -349,7 +349,7 @@ class MMSConfig(object):
       compiler.linkflags[0:0] = ['-lm']
       if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2']:
         dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
-      elif sdk.name in ['l4d', 'blade', 'insurgency', 'csgo', 'dota', 's2']:
+      elif sdk.name in ['l4d', 'blade', 'insurgency', 'csgo', 'dota', 'source2']:
         dynamic_libs = ['libtier0.so', 'libvstdlib.so']
       else:
         dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
@@ -358,7 +358,7 @@ class MMSConfig(object):
       dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
     elif builder.target_platform == 'windows':
       libs = ['tier0', 'tier1', 'vstdlib']
-      if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota', 's2']:
+      if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota', 'source2']:
         libs.append('interfaces')
       for lib in libs:
         lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
diff --git a/loader/loader_bridge.h b/loader/loader_bridge.h
deleted file mode 100644
index 07570ce..0000000
--- a/loader/loader_bridge.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * vim: set ts=4 sw=4 tw=99 noet :
- * ======================================================
- * Metamod:Source
- * Copyright (C) 2004-2009 AlliedModders LLC and authors.
- * All rights reserved.
- * ======================================================
- *
- * This software is provided 'as-is', without any express or implied warranty.
- * In no event will the authors be held liable for any damages arising from 
- * the use of this software.
- * 
- * Permission is granted to anyone to use this software for any purpose, 
- * including commercial applications, and to alter it and redistribute it 
- * freely, subject to the following restrictions:
- *
- * 1. The origin of this software must not be misrepresented; you must not 
- * claim that you wrote the original software. If you use this software in a 
- * product, an acknowledgment in the product documentation would be 
- * appreciated but is not required.
- * 2. Altered source versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.
- * 3. This notice may not be removed or altered from any source distribution.
- */
-
-#ifndef _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_
-#define _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_
-
-typedef void* (*QueryValveInterface)(const char *pName, int *pReturnCode);
-class IServerPluginCallbacks;
-
-struct vsp_bridge_info
-{
-	QueryValveInterface 		engineFactory;
-	QueryValveInterface 		gsFactory;
-	IServerPluginCallbacks *	vsp_callbacks;
-	unsigned int				vsp_version;
-};
-
-class IVspBridge
-{
-public:
-	virtual bool Load(const vsp_bridge_info *info, char *buffer, size_t maxlength) = 0;
-	virtual void Unload() = 0;
-	virtual const char *GetDescription() = 0;
-};
-
-struct gamedll_bridge_info
-{
-	QueryValveInterface engineFactory;
-	QueryValveInterface fsFactory;
-	QueryValveInterface physicsFactory;
-	QueryValveInterface	gsFactory;
-	void *				pGlobals;
-	unsigned int		dllVersion;
-	void *				isgd;
-	const char *		vsp_listener_path;
-};
-
-class IGameDllBridge
-{
-public:
-	virtual bool DLLInit_Pre(const gamedll_bridge_info *info, char *buffer, size_t maxlength) = 0;
-	virtual void DLLInit_Post(int *isgdUnload) = 0;
-	virtual void *QueryInterface(const char *name, int *ret) = 0;
-	virtual void Unload() = 0;
-};
-
-#endif /* _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_ */
-