From 4eafdc2a1eafa52c38218089508084a8f362ae6d Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 24 Aug 2012 01:38:01 -0400 Subject: [PATCH] Really fixed issues for today's TF2 engine update (bug 5450). --- extensions/sdktools/vglobals.cpp | 8 ------ gamedata/sdktools.games/engine.ep2valve.txt | 32 ++------------------- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/extensions/sdktools/vglobals.cpp b/extensions/sdktools/vglobals.cpp index b8759093..5bdae558 100644 --- a/extensions/sdktools/vglobals.cpp +++ b/extensions/sdktools/vglobals.cpp @@ -127,22 +127,14 @@ void GetIServer() #if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11 /* Get the CreateFakeClient function pointer */ -#if SOURCE_ENGINE == SE_ORANGEBOXVALVE - if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClientEx))) -#else if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClient))) -#endif { return; } #else /* Get the interface manually */ SourceHook::MemFuncInfo info = {true, -1, 0, 0}; -#if SOURCE_ENGINE == SE_ORANGEBOXVALVE - SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClientEx, info); -#else SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClient, info); -#endif vfunc = enginePatch->GetOrigFunc(info.vtbloffs, info.vtblindex); if (!vfunc) diff --git a/gamedata/sdktools.games/engine.ep2valve.txt b/gamedata/sdktools.games/engine.ep2valve.txt index e14483e9..e7d45e86 100644 --- a/gamedata/sdktools.games/engine.ep2valve.txt +++ b/gamedata/sdktools.games/engine.ep2valve.txt @@ -158,7 +158,7 @@ * here. */ - "CreateFakeClient_Windows" "\x55\x8B\xEC\x8A\x2A\x2A\xA2\x2A\x2A\x2A\x2A\x8B\x2A\x8B" + "CreateFakeClient_Windows" "\x55\x8B\xEC\x8B\x2A\x2A\x50\xB9\x2A\x2A\x2A\x2A\xE8" } "Offsets" @@ -166,7 +166,7 @@ /* Offset into IVEngineServer::CreateFakeClient */ "sv" { - "windows" "7" + "windows" "8" } } @@ -184,33 +184,7 @@ "#default" { - "#supported" - { - "game" "cstrike" - } - - "Keys" - { - "CreateFakeClient_Windows" "\x55\x8B\xEC\x8B\x2A\x2A\x8A\x2A\x2A\x51\xB9\x2A\x2A\x2A\x2A\xA2" - } - - "Offsets" - { - "sv" - { - "windows" "11" - } - } - - "Signatures" - { - "sv" - { - "library" "engine" - "linux" "@sv" - "mac" "@sv" - } - } + // This is broken for now on css. Functionality is compiled in and we only have a unified ep2v/css build on 1.4.x. } /* EntityFactoryDictionary function */