diff --git a/core/ExtensionSys.cpp b/core/ExtensionSys.cpp index afbc6060..2ab2a4a6 100644 --- a/core/ExtensionSys.cpp +++ b/core/ExtensionSys.cpp @@ -73,6 +73,8 @@ CLocalExtension::CLocalExtension(const char *filename) "extensions/auto.2.l4d/%s", #elif SOURCE_ENGINE == SE_ORANGEBOX "extensions/auto.2.ep2/%s", +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE + "extensions/auto.2.ep2valve", #elif SOURCE_ENGINE == SE_DARKMESSIAH "extensions/auto.2.darkm/%s", #else diff --git a/core/GameConfigs.cpp b/core/GameConfigs.cpp index a4509961..cd7f540a 100644 --- a/core/GameConfigs.cpp +++ b/core/GameConfigs.cpp @@ -109,6 +109,8 @@ static bool DoesEngineMatch(const char *value) if (strcmp(value, "darkmessiah") == 0) #elif SOURCE_ENGINE == SE_ORANGEBOX if (strcmp(value, "orangebox") == 0) +#elif SOURCE_ENGINE == SE_ORANGEBOXVALVE + if (strcmp(value, "orangebox_valve") == 0) #elif SOURCE_ENGINE == SE_LEFT4DEAD if (strcmp(value, "left4dead") == 0) #else diff --git a/core/PluginSys.h b/core/PluginSys.h index d1b37dd5..db3ab302 100644 --- a/core/PluginSys.h +++ b/core/PluginSys.h @@ -49,7 +49,7 @@ #include #if SOURCE_ENGINE == SE_LEFT4DEAD #include "convar_sm_l4d.h" -#elif SOURCE_ENGINE == SE_ORANGEBOX +#elif (SOURCE_ENGINE == SE_ORANGEBOX) || (SOURCE_ENGINE == SE_ORANGEBOXVALVE) #include "convar_sm_ob.h" #else #include "convar_sm.h" diff --git a/core/msvc9/sourcemod_mm.sln b/core/msvc9/sourcemod_mm.sln index 3da1d5ce..4c8558cd 100644 --- a/core/msvc9/sourcemod_mm.sln +++ b/core/msvc9/sourcemod_mm.sln @@ -9,16 +9,19 @@ Global CrazyDebug - Episode 1|Win32 = CrazyDebug - Episode 1|Win32 CrazyDebug - Left 4 Dead|Win32 = CrazyDebug - Left 4 Dead|Win32 CrazyDebug - Old Metamod|Win32 = CrazyDebug - Old Metamod|Win32 + CrazyDebug - Orange Box Valve|Win32 = CrazyDebug - Orange Box Valve|Win32 CrazyDebug - Orange Box|Win32 = CrazyDebug - Orange Box|Win32 Debug - Dark Messiah|Win32 = Debug - Dark Messiah|Win32 Debug - Episode 1|Win32 = Debug - Episode 1|Win32 Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32 Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32 + Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32 Debug - Orange Box|Win32 = Debug - Orange Box|Win32 Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32 Release - Episode 1|Win32 = Release - Episode 1|Win32 Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32 Release - Old Metamod|Win32 = Release - Old Metamod|Win32 + Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32 Release - Orange Box|Win32 = Release - Orange Box|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -30,6 +33,8 @@ Global {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Left 4 Dead|Win32.Build.0 = CrazyDebug - Left 4 Dead|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Old Metamod|Win32.ActiveCfg = CrazyDebug - Old Metamod|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Old Metamod|Win32.Build.0 = CrazyDebug - Old Metamod|Win32 + {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box Valve|Win32.ActiveCfg = CrazyDebug - Orange Box Valve|Win32 + {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box Valve|Win32.Build.0 = CrazyDebug - Orange Box Valve|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box|Win32.ActiveCfg = CrazyDebug - Orange Box|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.CrazyDebug - Orange Box|Win32.Build.0 = CrazyDebug - Orange Box|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Dark Messiah|Win32.ActiveCfg = Debug - Dark Messiah|Win32 @@ -40,6 +45,8 @@ Global {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32 + {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32 + {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32 @@ -50,6 +57,8 @@ Global {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32 + {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32 + {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32 {E39527CD-7CAB-4420-97CC-DA1B93B260BC}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32 EndGlobalSection diff --git a/core/msvc9/sourcemod_mm.vcproj b/core/msvc9/sourcemod_mm.vcproj index 0131b59e..71bbd4c3 100644 --- a/core/msvc9/sourcemod_mm.vcproj +++ b/core/msvc9/sourcemod_mm.vcproj @@ -40,7 +40,7 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1375,6 +1622,22 @@ Name="VCCLCompilerTool" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extensions/sdktools/msvc9/sdktools.sln b/extensions/sdktools/msvc9/sdktools.sln index ce1ff0c4..4506b200 100644 --- a/extensions/sdktools/msvc9/sdktools.sln +++ b/extensions/sdktools/msvc9/sdktools.sln @@ -9,11 +9,13 @@ Global Debug - Episode 1|Win32 = Debug - Episode 1|Win32 Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32 Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32 + Debug - Orange Box Valve|Win32 = Debug - Orange Box Valve|Win32 Debug - Orange Box|Win32 = Debug - Orange Box|Win32 Release - Dark Messiah|Win32 = Release - Dark Messiah|Win32 Release - Episode 1|Win32 = Release - Episode 1|Win32 Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32 Release - Old Metamod|Win32 = Release - Old Metamod|Win32 + Release - Orange Box Valve|Win32 = Release - Orange Box Valve|Win32 Release - Orange Box|Win32 = Release - Orange Box|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -25,6 +27,8 @@ Global {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32 + {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Orange Box Valve|Win32.ActiveCfg = Debug - Orange Box Valve|Win32 + {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Orange Box Valve|Win32.Build.0 = Debug - Orange Box Valve|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Dark Messiah|Win32.ActiveCfg = Release - Dark Messiah|Win32 @@ -35,6 +39,8 @@ Global {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32 + {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Orange Box Valve|Win32.ActiveCfg = Release - Orange Box Valve|Win32 + {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Orange Box Valve|Win32.Build.0 = Release - Orange Box Valve|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32 {7A740927-C751-4312-BF9D-6367F8C508F8}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32 EndGlobalSection diff --git a/extensions/sdktools/msvc9/sdktools.vcproj b/extensions/sdktools/msvc9/sdktools.vcproj index 0a9eddb5..71dba3cb 100644 --- a/extensions/sdktools/msvc9/sdktools.vcproj +++ b/extensions/sdktools/msvc9/sdktools.vcproj @@ -40,7 +40,7 @@ /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/extensions/tf2/msvc9/tf2.vcproj b/extensions/tf2/msvc9/tf2.vcproj index 9e9e9f54..1ce6b7ca 100644 --- a/extensions/tf2/msvc9/tf2.vcproj +++ b/extensions/tf2/msvc9/tf2.vcproj @@ -41,7 +41,7 @@ pl_path, "tf/", 3) == 0) + { + filename = FILENAME_1_6_EP2VALVE; + break; + } + filename = FILENAME_1_6_EP2; break; } diff --git a/tools/builder/LinuxBuilder.cs b/tools/builder/LinuxBuilder.cs index ea32d8da..689b9d87 100644 --- a/tools/builder/LinuxBuilder.cs +++ b/tools/builder/LinuxBuilder.cs @@ -45,6 +45,10 @@ namespace builder { output_folder += ".orangebox"; } + else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve) + { + output_folder += ".orangeboxvalve"; + } else if (lib.build_mode == BuildMode.BuildMode_OldMetamod) { output_folder += ".original"; @@ -73,6 +77,10 @@ namespace builder { makefile_args += "ENGINE=\"orangebox\" "; } + else if (lib.build_mode == BuildMode.BuildMode_Episode2Valve) + { + makefile_args += "ENGINE=\"orangeboxvalve\" "; + } else if (lib.build_mode == BuildMode.BuildMode_OldMetamod) { makefile_args += "ENGINE=\"original\""; diff --git a/tools/builder/Package.cs b/tools/builder/Package.cs index 852a3bf5..8e79e596 100644 --- a/tools/builder/Package.cs +++ b/tools/builder/Package.cs @@ -15,6 +15,7 @@ namespace builder BuildMode_DarkMessiah, BuildMode_Episode1, BuildMode_Episode2, + BuildMode_Episode2Valve, BuildMode_Left4Dead }; diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs index 24a1f123..719798f8 100644 --- a/tools/builder/PkgCore.cs +++ b/tools/builder/PkgCore.cs @@ -184,6 +184,14 @@ namespace builder lib.build_mode = BuildMode.BuildMode_Episode2; libraries.Add(lib); + lib = new Library(); + lib.package_path = "addons/sourcemod/bin"; + lib.source_path = "core"; + lib.binary_name = "sourcemod.2.ep2valve"; + lib.vcproj_name = "sourcemod_mm"; + lib.build_mode = BuildMode.BuildMode_Episode2Valve; + libraries.Add(lib); + lib = new Library(); lib.package_path = "addons/sourcemod/bin"; lib.source_path = "core"; @@ -238,6 +246,14 @@ namespace builder lib.build_mode = BuildMode.BuildMode_Episode2; libraries.Add(lib); + lib = new Library(); + lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve"; + lib.source_path = "extensions/bintools"; + lib.binary_name = "bintools.ext"; + lib.vcproj_name = "bintools"; + lib.build_mode = BuildMode.BuildMode_Episode2Valve; + libraries.Add(lib); + lib = new Library(); lib.package_path = "addons/sourcemod/extensions/auto.2.l4d"; lib.source_path = "extensions/bintools"; @@ -278,6 +294,14 @@ namespace builder lib.build_mode = BuildMode.BuildMode_Episode2; libraries.Add(lib); + lib = new Library(); + lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve"; + lib.source_path = "extensions/sdktools"; + lib.binary_name = "sdktools.ext"; + lib.vcproj_name = "sdktools"; + lib.build_mode = BuildMode.BuildMode_Episode2Valve; + libraries.Add(lib); + lib = new Library(); lib.package_path = "addons/sourcemod/extensions/auto.2.l4d"; lib.source_path = "extensions/sdktools"; @@ -309,11 +333,11 @@ namespace builder libraries.Add(lib); lib = new Library(); - lib.package_path = "addons/sourcemod/extensions/auto.2.ep2"; + lib.package_path = "addons/sourcemod/extensions/auto.2.ep2valve"; lib.source_path = "extensions/tf2"; lib.binary_name = "game.tf2.ext"; lib.vcproj_name = "tf2"; - lib.build_mode = BuildMode.BuildMode_Episode2; + lib.build_mode = BuildMode.BuildMode_Episode2Valve; libraries.Add(lib); lib = new Library(); diff --git a/tools/builder/Win32Builder.cs b/tools/builder/Win32Builder.cs index fc83fb44..3f6e20c1 100644 --- a/tools/builder/Win32Builder.cs +++ b/tools/builder/Win32Builder.cs @@ -50,6 +50,10 @@ namespace builder { config_name = config_name + " - Orange Box"; } + else if (lib.build_mode == BuildMode.BuildMode_Episde2Valve) + { + config_name = config_name + " - Orange Box Valve"; + } else if (lib.build_mode == BuildMode.BuildMode_OldMetamod) { config_name = config_name + " - Old Metamod";