Add support for Contagion (bug 6007, r=asherkin).
authorNicholas Hastings <skamonkey@gmail.com>
Sat Mar 29 14:14:00 2014 -0400 (2014-03-29)
changeset 43015a9c242fa868
parent 4300 cc206102001c
child 4302 9f455f812556
Add support for Contagion (bug 6007, r=asherkin).
AMBuildScript
core/logic_bridge.cpp
core/smn_halflife.cpp
loader/loader.cpp
plugins/include/halflife.inc
     1.1 --- a/AMBuildScript	Thu Mar 27 22:52:16 2014 -0400
     1.2 +++ b/AMBuildScript	Sat Mar 29 14:14:00 2014 -0400
     1.3 @@ -30,16 +30,17 @@
     1.4    'tf2':  SDK('HL2SDKTF2', '2.tf2', '10', 'TF2', WinLinuxMac, 'tf2'),
     1.5    'l4d':  SDK('HL2SDKL4D', '2.l4d', '11', 'LEFT4DEAD', WinLinuxMac, 'l4d'),
     1.6    'nd': SDK('HL2SDKND', '2.nd', '12', 'NUCLEARDAWN', WinLinuxMac, 'nd'),
     1.7 -  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '13', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
     1.8 +  'l4d2': SDK('HL2SDKL4D2', '2.l4d2', '14', 'LEFT4DEAD2', WinLinuxMac, 'l4d2'),
     1.9    'darkm':  SDK('HL2SDK-DARKM', '2.darkm', '2', 'DARKMESSIAH', WinOnly, 'darkm'),
    1.10 -  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '14', 'ALIENSWARM', WinOnly, 'swarm'),
    1.11 +  'swarm':  SDK('HL2SDK-SWARM', '2.swarm', '15', 'ALIENSWARM', WinOnly, 'swarm'),
    1.12    'bgt':  SDK('HL2SDK-BGT', '2.bgt', '4', 'BLOODYGOODTIME', WinOnly, 'bgt'),
    1.13    'eye':  SDK('HL2SDK-EYE', '2.eye', '5', 'EYE', WinOnly, 'eye'),
    1.14 -  'csgo': SDK('HL2SDKCSGO', '2.csgo', '18', 'CSGO', WinLinuxMac, 'csgo'),
    1.15 -  'dota': SDK('HL2SDKDOTA', '2.dota', '19', 'DOTA', WinLinuxMac, 'dota'),
    1.16 -  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '15', 'PORTAL2', [], 'portal2'),
    1.17 -  'blade':  SDK('HL2SDKBLADE', '2.blade', '16', 'BLADE', WinLinux, 'blade'),
    1.18 -  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '17', 'INSURGENCY', WinLinuxMac, 'insurgency'),
    1.19 +  'csgo': SDK('HL2SDKCSGO', '2.csgo', '19', 'CSGO', WinLinuxMac, 'csgo'),
    1.20 +  'dota': SDK('HL2SDKDOTA', '2.dota', '20', 'DOTA', WinLinuxMac, 'dota'),
    1.21 +  'portal2':  SDK('HL2SDKPORTAL2', '2.portal2', '16', 'PORTAL2', [], 'portal2'),
    1.22 +  'blade':  SDK('HL2SDKBLADE', '2.blade', '17', 'BLADE', WinLinux, 'blade'),
    1.23 +  'insurgency':  SDK('HL2SDKINSURGENCY', '2.insurgency', '18', 'INSURGENCY', WinLinuxMac, 'insurgency'),
    1.24 +  'contagion':  SDK('HL2SDKCONTAGION', '2.contagion', '13', 'CONTAGION', WinOnly, 'contagion'),
    1.25  }
    1.26  
    1.27  def ResolveEnvPath(env, folder):
     2.1 --- a/core/logic_bridge.cpp	Thu Mar 27 22:52:16 2014 -0400
     2.2 +++ b/core/logic_bridge.cpp	Sat Mar 29 14:14:00 2014 -0400
     2.3 @@ -247,6 +247,8 @@
     2.4  	return "left4dead";
     2.5  #elif SOURCE_ENGINE == SE_NUCLEARDAWN
     2.6  	return "nucleardawn";
     2.7 +#elif SOURCE_ENGINE == SE_CONTAGION
     2.8 +	return "contagion";
     2.9  #elif SOURCE_ENGINE == SE_LEFT4DEAD2
    2.10  	return "left4dead2";
    2.11  #elif SOURCE_ENGINE == SE_ALIENSWARM
    2.12 @@ -398,6 +400,8 @@
    2.13  #define GAMEFIX "2.csgo"
    2.14  #elif SOURCE_ENGINE == SE_DOTA
    2.15  #define GAMEFIX "2.dota"
    2.16 +#elif SOURCE_ENGINE == SE_CONTAGION
    2.17 +#define GAMEFIX "2.contagion"
    2.18  #else
    2.19  #define GAMEFIX "2.ep1"
    2.20  #endif //(SOURCE_ENGINE == SE_LEFT4DEAD) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
     3.1 --- a/core/smn_halflife.cpp	Thu Mar 27 22:52:16 2014 -0400
     3.2 +++ b/core/smn_halflife.cpp	Sat Mar 29 14:14:00 2014 -0400
     3.3 @@ -502,6 +502,7 @@
     3.4  	case SOURCE_ENGINE_LEFT4DEAD:
     3.5  		return 40;
     3.6  	case SOURCE_ENGINE_NUCLEARDAWN:
     3.7 +	case SOURCE_ENGINE_CONTAGION:
     3.8  	case SOURCE_ENGINE_LEFT4DEAD2:
     3.9  		return 50;
    3.10  	case SOURCE_ENGINE_ALIENSWARM:
     4.1 --- a/loader/loader.cpp	Thu Mar 27 22:52:16 2014 -0400
     4.2 +++ b/loader/loader.cpp	Sat Mar 29 14:14:00 2014 -0400
     4.3 @@ -86,6 +86,7 @@
     4.4  #define FILENAME_1_6_DOTA			"sourcemod.2.dota" PLATFORM_EXT
     4.5  #define FILENAME_1_6_BLADE			"sourcemod.2.blade" PLATFORM_EXT
     4.6  #define FILENAME_1_6_INSURGENCY		"sourcemod.2.insurgency" PLATFORM_EXT
     4.7 +#define FILENAME_1_6_CONTAGION		"sourcemod.2.contagion" PLATFORM_EXT
     4.8  
     4.9  HINSTANCE g_hCore = NULL;
    4.10  bool load_attempted = false;
    4.11 @@ -260,6 +261,11 @@
    4.12  			filename = FILENAME_1_6_ND;
    4.13  			break;
    4.14  		}
    4.15 +	case SOURCE_ENGINE_CONTAGION:
    4.16 +		{
    4.17 +			filename = FILENAME_1_6_CONTAGION;
    4.18 +			break;
    4.19 +		}
    4.20  	case SOURCE_ENGINE_ALIENSWARM:
    4.21  		{
    4.22  			filename = FILENAME_1_6_SWARM;
     5.1 --- a/plugins/include/halflife.inc	Thu Mar 27 22:52:16 2014 -0400
     5.2 +++ b/plugins/include/halflife.inc	Sat Mar 29 14:14:00 2014 -0400
     5.3 @@ -87,6 +87,7 @@
     5.4  	Engine_SDK2013,				/**< Source SDK 2013 */
     5.5  	Engine_Blade,				/**< Blade Symphony */
     5.6  	Engine_Insurgency,			/**< Insurgency (2013 Retail version)*/
     5.7 +	Engine_Contagion,			/**< Contagion */
     5.8  };
     5.9  
    5.10  #define INVALID_ENT_REFERENCE 0xFFFFFFFF