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

Remove hook on AllowDedicatedServer - no longer necessary.

Browse Source
This commit is contained in:
Nicholas Hastings 2015-08-31 14:05:09 -04:00
parent a73b63cb51
commit 4461b5e1b8
2 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/provider/provider_ep2.cpp
View File

@ -43,14 +43,6 @@
#include <iserver.h> #include <iserver.h>
#endif #endif
#if SOURCE_ENGINE == SE_SOURCE2
SH_DECL_HOOK1(ISource2ServerConfig, AllowDedicatedServers, const, 0, bool, EUniverse);
bool BaseProvider::AllowDedicatedServers(EUniverse universe) const
{
RETURN_META_VALUE(MRES_SUPERCEDE, true);
}
#endif
/* Types */ /* Types */
typedef void (*CONPRINTF_FUNC)(const char *, ...); typedef void (*CONPRINTF_FUNC)(const char *, ...);
struct UsrMsgInfo struct UsrMsgInfo
@ -195,10 +187,6 @@ void BaseProvider::Notify_DLLInit_Pre(CreateInterfaceFn engineFactory,
{ {
SH_ADD_HOOK_STATICFUNC(IServerGameClients, ClientCommand, gameclients, ClientCommand, false); SH_ADD_HOOK_STATICFUNC(IServerGameClients, ClientCommand, gameclients, ClientCommand, false);
} }
#if SOURCE_ENGINE == SE_SOURCE2
SH_ADD_VPHOOK(ISource2ServerConfig, AllowDedicatedServers, serverconfig, SH_MEMBER(this, &BaseProvider::AllowDedicatedServers), false);
#endif
} }
void BaseProvider::Notify_DLLShutdown_Pre() void BaseProvider::Notify_DLLShutdown_Pre()

48
loader/gamedll.cpp
View File

@ -52,7 +52,6 @@ static ISource2ServerConfig *config_iface = NULL;
static QueryValveInterface gamedll_qvi = NULL; static QueryValveInterface gamedll_qvi = NULL;
static int gamedll_version = 0; static int gamedll_version = 0;
static int isgd_shutdown_index = -1; static int isgd_shutdown_index = -1;
static int is2sc_allowdedi_index = 20;
static char mm_path[PLATFORM_MAX_PATH]; static char mm_path[PLATFORM_MAX_PATH];
static bool g_is_source2 = false; static bool g_is_source2 = false;
@ -229,15 +228,11 @@ mm_PatchDllInit(bool patch);
static void static void
mm_PatchDllShutdown(); mm_PatchDllShutdown();
static void
mm_PatchAllowDedicated(bool patch);
static void static void
mm_PatchConnect(bool patch); mm_PatchConnect(bool patch);
static void *isgd_orig_init = NULL; static void *isgd_orig_init = NULL;
static void *isgd_orig_shutdown = NULL; static void *isgd_orig_shutdown = NULL;
static void *is2sc_orig_allowdedi = NULL;
static void *is2sc_orig_connect = NULL; static void *is2sc_orig_connect = NULL;
class VEmptyClass class VEmptyClass
@ -247,9 +242,8 @@ class VEmptyClass
gamedll_bridge_info g_bridge_info; gamedll_bridge_info g_bridge_info;
// Source2 - Rough start order // Source2 - Rough start order
// CreateInterfaceFn (IS2SC) - hook Connect and AllowDedicatedServer // CreateInterfaceFn (IS2SC) - hook Connect
// IS2SC::Connect - save factory pointer. return orig. remove hook. // IS2SC::Connect - save factory pointer. return orig. remove hook.
// IS2SC::AllowDedicatedServer - return true. remove hook.
// CreateInterfaceFn (IS2S) - hook Init and Shutdown // CreateInterfaceFn (IS2S) - hook Init and Shutdown
// IS2S::Init - do same as old ISGD::DLLInit, including core load. return orig. remove hook. // IS2S::Init - do same as old ISGD::DLLInit, including core load. return orig. remove hook.
// IS2S::Shutdown - <-- this // IS2S::Shutdown - <-- this
@ -299,11 +293,6 @@ public:
return result; return result;
} }
virtual bool AllowDedicatedServers(int universe) const
{
mm_PatchAllowDedicated(false);
return true;
}
}; };
class ISource2Server class ISource2Server
@ -661,40 +650,6 @@ mm_PatchDllShutdown()
vtable_dest[isgd_shutdown_index] = vtable_src[mfp.vtblindex]; vtable_dest[isgd_shutdown_index] = vtable_src[mfp.vtblindex];
} }
static void
mm_PatchAllowDedicated(bool patch)
{
void **vtable_src;
void **vtable_dest;
SourceHook::MemFuncInfo mfp;
SourceHook::GetFuncInfo(&ISource2ServerConfig::AllowDedicatedServers, mfp);
assert(mfp.isVirtual);
assert(mfp.thisptroffs == 0);
assert(mfp.vtbloffs == 0);
vtable_src = (void **) *(void **) &is2sc_thunk;
vtable_dest = (void **) *(void **) config_iface;
SourceHook::SetMemAccess(&vtable_dest[is2sc_allowdedi_index],
sizeof(void*),
SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC);
if (patch)
{
assert(is2sc_orig_allowdedi == NULL);
is2sc_orig_allowdedi = vtable_dest[is2sc_allowdedi_index];
vtable_dest[is2sc_allowdedi_index] = vtable_src[mfp.vtblindex];
}
else
{
assert(is2sc_orig_allowdedi != NULL);
vtable_dest[is2sc_allowdedi_index] = is2sc_orig_allowdedi;
is2sc_orig_allowdedi = NULL;
}
}
static void static void
mm_PatchConnect(bool patch) mm_PatchConnect(bool patch)
{ {
@ -776,7 +731,6 @@ mm_GameDllRequest(const char *name, int *ret)
gamedll_qvi = qvi; gamedll_qvi = qvi;
mm_PatchConnect(true); mm_PatchConnect(true);
mm_PatchAllowDedicated(true);
if (ret != NULL) if (ret != NULL)
*ret = 0; *ret = 0;