rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-21 14:54:14 +01:00
Code Issues Releases Activity

Don't compile in VSP bridge on s2.

Browse Source
This commit is contained in:
Nick Hastings 2023-04-02 11:01:22 -04:00
parent 6a1a79df42
commit 15c84495cb
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/AMBuilder
View File

@ -23,8 +23,7 @@ for sdk_name in MMS.sdks:
'sourcehook/sourcehook_impl_chookmaninfo.cpp', 'sourcehook/sourcehook_impl_chookmaninfo.cpp',
'sourcehook/sourcehook_impl_cproto.cpp', 'sourcehook/sourcehook_impl_cproto.cpp',
'sourcehook/sourcehook_impl_cvfnptr.cpp', 'sourcehook/sourcehook_impl_cvfnptr.cpp',
'gamedll_bridge.cpp', 'gamedll_bridge.cpp'
'vsp_bridge.cpp'
] ]
if sdk_name in ['dota', 'cs2']: if sdk_name in ['dota', 'cs2']:
@ -32,7 +31,8 @@ for sdk_name in MMS.sdks:
else: else:
binary.sources += [ binary.sources += [
'provider/source/provider_source.cpp', 'provider/source/provider_source.cpp',
'provider/source/provider_source_console.cpp' 'provider/source/provider_source_console.cpp',
'vsp_bridge.cpp'
] ]
# Source2 hack. TODO: check this more deterministically, "are we doing an x64 build?" # Source2 hack. TODO: check this more deterministically, "are we doing an x64 build?"

15
core/vsp_bridge.cpp
View File

@ -34,9 +34,7 @@
#include <sh_string.h> #include <sh_string.h>
#include "provider/provider_base.h" #include "provider/provider_base.h"
#if SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_HOOK2_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommandContext &, const CCommand &);
#elif SOURCE_ENGINE >= SE_ORANGEBOX
SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &);
#else #else
SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false); SH_DECL_HOOK0_void(ConCommand, Dispatch, SH_NOATTRIB, false);
@ -46,9 +44,7 @@ ConCommand *g_plugin_unload = NULL;
bool g_bIsTryingToUnload; bool g_bIsTryingToUnload;
SourceHook::String vsp_desc("Metamod:Source"); SourceHook::String vsp_desc("Metamod:Source");
#if SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE >= SE_ORANGEBOX
void InterceptPluginUnloads(const CCommandContext &context, const CCommand &args)
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void InterceptPluginUnloads(const CCommand &args) void InterceptPluginUnloads(const CCommand &args)
#else #else
void InterceptPluginUnloads() void InterceptPluginUnloads()
@ -57,9 +53,7 @@ void InterceptPluginUnloads()
g_bIsTryingToUnload = true; g_bIsTryingToUnload = true;
} }
#if SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE >= SE_ORANGEBOX
void InterceptPluginUnloads_Post(const CCommandContext &context, const CCommand &args)
#elif SOURCE_ENGINE >= SE_ORANGEBOX
void InterceptPluginUnloads_Post(const CCommand &args) void InterceptPluginUnloads_Post(const CCommand &args)
#else #else
void InterceptPluginUnloads_Post() void InterceptPluginUnloads_Post()
@ -165,13 +159,12 @@ public:
virtual void Unload() virtual void Unload()
{ {
// Source2 doesn't have the Error function (nor VSP support). // Source2 doesn't have the Error function (nor VSP support).
#if SOURCE_ENGINE != SE_DOTA
if (g_bIsTryingToUnload) if (g_bIsTryingToUnload)
{ {
Error("Metamod:Source cannot be unloaded from VSP mode. Use \"meta unload\" to unload specific plugins.\n"); Error("Metamod:Source cannot be unloaded from VSP mode. Use \"meta unload\" to unload specific plugins.\n");
return; return;
} }
#endif
if (g_plugin_unload != NULL) if (g_plugin_unload != NULL)
{ {
SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false); SH_REMOVE_HOOK_STATICFUNC(ConCommand, Dispatch, g_plugin_unload, InterceptPluginUnloads, false);