R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Dedicated server improvements

Browse Source
This commit is contained in:
Amos 2021-12-30 17:20:41 +01:00
parent 6d4f7e345f
commit 22c0b5c867
14 changed files with 126 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
r5dev/common/opcodes.cpp
View File

@ -50,6 +50,7 @@ void Dedicated_Init()
{
*(uintptr_t*)0x14D415040 = 0x1417304E8;
*(uintptr_t*)0x14B37C3C0 = 0x141F10CA0;
*(uintptr_t*)0x14B3800D7 = 0x1; // bDedicated
NoShaderApi_Init();
@ -77,12 +78,13 @@ void Dedicated_Init()
// CENGINEAPI
//-------------------------------------------------------------------------
gCEngineAPI__Init.Offset(0xB7).Patch({ 0xE9, 0xC7, 0x00, 0x00, 0x00 }); // JNE --> JNP | Skip Video Mode validation code.
gCEngineAPI__OnStartup.Offset(0x5E).Patch({ 0xE9, 0xC6, 0x01, 0x00, 0x00 }); // JNE --> JNP | Skip Video Mode initialization code.
gCEngineAPI__Connect.Offset(0xDD).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to texture and material preloading.
gCEngineAPI__Connect.Offset(0xF1).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to texture and material preloading.
gCEngineAPI__Connect.Offset(0x1C6).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to texture and material preloading.
//gCEngineAPI__Connect.Offset(0x3E).Patch({ 0xE9, 0x8F, 0x01, 0x00, 0x00 }); // JE --> JMP | NOP call to texture and material preloading.
//gCEngineAPI__Connect.Offset(0xDD).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to texture and material preloading.
//gCEngineAPI__Connect.Offset(0xF1).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to texture and material preloading.
//gCEngineAPI__Connect.Offset(0x1C6).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | NOP call to texture and material preloading.
//gCEngineAPI__ModInit.Offset(0x3DD).Patch({ 0xE9, 0xB5, 0x00, 0x00, 0x00, 0x00 }); // JNE --> JNP | Skip CreateWindow Initialization code.
gCEngineAPI__ModInit.Offset(0x44C).Patch({ 0xEB, 0x49 }); // JNZ --> JMP | Skip CreateGameWindow validation code.
//gCEngineAPI__ModInit.Offset(0x44C).Patch({ 0xEB, 0x49 }); // JNZ --> JMP | Skip CreateGameWindow validation code.
//gCEngineAPI__ModInit.Offset(0x3DD).Patch({ 0xEB, 0x6D }); // JE --> JMP | Skip CreateGameWindow initialization code.
//-------------------------------------------------------------------------
@ -105,10 +107,22 @@ void Dedicated_Init()
//-------------------------------------------------------------------------
// CSOURCEAPPSYSTEMGROUP
//-------------------------------------------------------------------------
gCSourceAppSystemGroup__Create.Offset(0x2A5).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90}); // CAL --> NOP | studioRender->Connect().
gCSourceAppSystemGroup__Create.Offset(0x35D).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | joystickInit?
gCSourceAppSystemGroup__Create.Offset(0x384).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | PrecacheMaterial.
gCSourceAppSystemGroup__Create.Offset(0x39E).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | binkBlankTexture.
gCSourceAppSystemGroup__Create.Offset(0x248).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | inputSystem->Connect().
gCSourceAppSystemGroup__Create.Offset(0x267).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | materials->Connect().
//gCSourceAppSystemGroup__Create.Offset(0x286).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | mdlCache->Connect().
gCSourceAppSystemGroup__Create.Offset(0x2A5).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | studioRender->Connect().
gCSourceAppSystemGroup__Create.Offset(0x2C4).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | avi->Connect().
gCSourceAppSystemGroup__Create.Offset(0x2E3).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | engineAPI->Connect().
//gCSourceAppSystemGroup__Create.Offset(0x302).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | dataCache->Connect().
gCSourceAppSystemGroup__Create.Offset(0x321).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | matSystemSurface->Connect().
gCSourceAppSystemGroup__Create.Offset(0x340).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | vgui->Connect().
gCSourceAppSystemGroup__Create.Offset(0x35D).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | inputSystem->Init().
gCSourceAppSystemGroup__Create.Offset(0x384).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | studioRender->Init().
gCSourceAppSystemGroup__Create.Offset(0x39E).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | bik->Init().
gCSourceAppSystemGroup__Create.Offset(0x3AB).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | engineAPI->Init().
gCSourceAppSystemGroup__Create.Offset(0x3F6).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | vgui->Init().
gCSourceAppSystemGroup__Create.Offset(0x3E9).Patch({ 0x90, 0x90, 0x90 }); // CAL --> NOP | matEmbeddedPanel->Init().
gCSourceAppSystemGroup__Create.Offset(0x3F9).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> NOP | EAC_ClientInterface_Init().
//-------------------------------------------------------------------------
// CVIDEOMODE_COMMON
@ -118,17 +132,17 @@ void Dedicated_Init()
//-------------------------------------------------------------------------
// CMATERIALSYSTEM
//-------------------------------------------------------------------------
gCMaterialSystem__MatsysMode_Init.Offset(0x22).Patch({ 0xEB, 0x66 }); // JE --> JMP | Matsys mode init (CMaterialSystem).
//-------------------------------------------------------------------------
// CSHADERSYSTEM
//-------------------------------------------------------------------------
gCShaderSystem__9.Offset(0x3).Patch({ 0xE9, 0x95, 0x03, 0x00, 0x00 }); // Unnecessary CShaderSystem call?
//gCMaterialSystem__MatsysMode_Init.Offset(0x22).Patch({ 0xEB, 0x66 }); // JE --> JMP | Matsys mode init (CMaterialSystem). // TODO: Needed?
//-------------------------------------------------------------------------
// CSHADERGLUE
//-------------------------------------------------------------------------
gCShaderGlue__Init.Patch({ 0xC3 }); // FUN --> RET | Skip ShaderSetup(). CShaderGlue.
//gCShaderGlue__Init.Patch({ 0xC3 }); // FUN --> RET | Skip ShaderSetup(). CShaderGlue.
//-------------------------------------------------------------------------
// RUNTIME: SYS_INITGAME
//-------------------------------------------------------------------------
Sys_InitGame.Offset(0x70).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 }); // STZNZ --> NOP | Prevent 'bDedicated' from being set to false.
//-------------------------------------------------------------------------
// RUNTIME: HOST_INIT
@ -137,12 +151,17 @@ void Dedicated_Init()
gHost_Init_0.Offset(0x182).Patch({ 0x90, 0x90, 0x90, 0x90, 0x90 }); // CAL --> JMP | Disable UI material asset initialization.
gHost_Init_0.Offset(0x859).Patch({ 0xE9, 0x19, 0x04, 0x00, 0x00 }); // LEA --> RET | Disable 'client.dll' library initialization.
gHost_Init_0.Offset(0xC77).Patch({ 0xE8, 0x44, 0xCF, 0xFF, 0xFF }); // CAL --> CAL | Disable user config loading and call entitlements.rson initialization instead.
gHost_Init_1.Offset(0x19).Patch({ 0xEB, 0x6E }); // JNE --> JMP | Take dedicated initialization routine instead.
//gHost_Init_1.Offset(0x19).Patch({ 0xEB, 0x6E }); // JNE --> JMP | Take dedicated initialization routine instead. // REMOVE
gHost_Init_1.Offset(0x609).Patch({ 0xEB, 0x2B }); // JE --> JMP | Skip client.dll Init_PostVideo() validation code.
gHost_Init_1.Offset(0x621).Patch({ 0xEB, 0x0C }); // JNE --> JMP | Skip client.dll Init_PostVideo() validation code.
gHost_Init_1.Offset(0x658).Patch({ 0xE9, 0x8C, 0x00, 0x00, 0x00 }); // JE --> JMP | Skip NULL call as client is never initialized.
gHost_Init_1.Offset(0x6E9).Patch({ 0xE9, 0xB0, 0x00, 0x00, 0x00 }); // JNE --> JMP | Skip shader preloading as cvar can't be checked due to client being NULL.
//gHost_Init_2.Offset(0x5D8).Patch({ 0xEB, 0x05 }); // JE --> JMP | Render?
gHost_Init_2.Offset(0x26F).Patch({ 0xE9, 0x4D, 0x05, 0x00, 0x00 }); // JNE --> JMP | client.dll systems initialization.
//-------------------------------------------------------------------------
// RUNTIME: _HOST_RUNFRAME

8
r5dev/common/opcodes.h
View File

@ -61,13 +61,19 @@ namespace
ADDRESS e4 = 0x0000000140BE1970;
ADDRESS e5 = 0x0000000140DBBAF0;
ADDRESS e6 = 0x0000000140DBE610;
ADDRESS e7 = 0x000000014044AFA0;
ADDRESS e8 = 0x000000014027EC50; // RenderFrame?
ADDRESS gCEngineAPI__Init = 0x0000000140342FB0; //
ADDRESS gCEngineAPI__ModInit = 0x0000000140343DE0; //
ADDRESS gCEngineAPI__Connect = 0x0000000140342BA0; //
ADDRESS gCEngineAPI__OnStartup = 0x0000000140343860; //
ADDRESS gCSourceAppSystemGroup__Create = 0x000000014044AFA0; //
ADDRESS Sys_InitGame = 0x1402958D0;
ADDRESS CShaderSystem__Init = 0x00000001403DF870; //
ADDRESS gInitMaterialSystem = 0x000000014024B390; //
ADDRESS gCVideoMode_Common__DrawStartupGraphic = 0x000000014027F0F0; //

3
r5dev/core/dllmain.cpp
View File

@ -7,6 +7,7 @@
#include "windows/input.h"
#endif // !DEDICATED
#include "windows/console.h"
#include "windows/system.h"
//#############################################################################
// INITIALIZATION
@ -16,6 +17,7 @@ void R5Dev_Init()
{
Console_Init();
Systems_Init();
WinSys_Attach();
#ifndef DEDICATED
Input_Init();
@ -32,6 +34,7 @@ void R5Dev_Init()
void R5Dev_Shutdown()
{
Systems_Shutdown();
WinSys_Detach();
#ifndef DEDICATED
Input_Shutdown();

5
r5dev/core/init.cpp
View File

@ -35,9 +35,6 @@
#include "rtech/rtech_game.h"
#include "rtech/stryder.h"
#include "engine/baseclient.h"
#ifndef DEDICATED
#include "engine/debugoverlay.h"
#endif // !DEDICATED
#include "engine/host_cmd.h"
#include "engine/host_state.h"
#include "engine/net_chan.h"
@ -50,7 +47,6 @@
#endif // !DEDICATED
/////////////////////////////////////////////////////////////////////////////////////////////////
//
// ██╗███╗ ██╗██╗████████╗██╗ █████╗ ██╗ ██╗███████╗ █████╗ ████████╗██╗ ██████╗ ███╗ ██╗
@ -80,7 +76,6 @@ void Systems_Init()
CEngineVGui_Attach();
CFPSPanel_Attach();
CHLClient_Attach();
DebugOverlays_Init();
#endif // !DEDICATED
CServer_Attach();

2
r5dev/dedicated.vcxproj
View File

@ -324,6 +324,7 @@
<ClInclude Include="vphysics\QHull.h" />
<ClInclude Include="vpklib\packedstore.h" />
<ClInclude Include="windows\console.h" />
<ClInclude Include="windows\system.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="bsplib\bsplib.cpp" />
@ -371,6 +372,7 @@
<ClCompile Include="vphysics\QHull.cpp" />
<ClCompile Include="vpklib\packedstore.cpp" />
<ClCompile Include="windows\console.cpp" />
<ClCompile Include="windows\system.cpp" />
</ItemGroup>
<ItemGroup>
<None Include="r5dev.def" />

6
r5dev/dedicated.vcxproj.filters
View File

@ -564,6 +564,9 @@
<ClInclude Include="rtech\rtech_game.h">
<Filter>sdk\rtech</Filter>
</ClInclude>
<ClInclude Include="windows\system.h">
<Filter>windows</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="client\IVEngineClient.cpp">
@ -692,6 +695,9 @@
<ClCompile Include="rtech\rtech_game.cpp">
<Filter>sdk\rtech</Filter>
</ClCompile>
<ClCompile Include="windows\system.cpp">
<Filter>windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="r5dev.def" />

15
r5dev/engine/debugoverlay.cpp
View File

@ -1,15 +0,0 @@
#include "core/stdafx.h"
#include "tier0/basetypes.h"
#include "engine/debugoverlay.h"
//-----------------------------------------------------------------------------
// Purpose: enables 'DrawAllOverlays()'
//-----------------------------------------------------------------------------
void DebugOverlays_Init()
{
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
p_DrawAllOverlays.Offset(0x189).Patch({ 0x83, 0x3F, 0x02 }); // Default value in memory is 0x2, condition is 0x4. Patch to fulfill condition.
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
p_DrawAllOverlays.Offset(0x188).Patch({ 0x83, 0x3F, 0x02 }); // Default value in memory is 0x2, condition is 0x4. Patch to fulfill condition.
#endif
}

26
r5dev/engine/debugoverlay.h
View File

@ -1,26 +0,0 @@
#pragma once
namespace
{
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
ADDRESS p_DrawAllOverlays = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x55\x48\x83\xEC\x50\x48\x8B\x05\x00\x00\x00\x00", "xxxxxxxxx????");
void (*DrawAllOverlays)(char a1) = (void (*)(char))p_DrawAllOverlays.GetPtr(); /*40 55 48 83 EC 50 48 8B 05 ? ? ? ?*/
#elif defined (GAMEDLL_S2) || defined (GAMEDLL_S3)
ADDRESS p_DrawAllOverlays = g_mGameDll.FindPatternSIMD((std::uint8_t*)"\x40\x55\x48\x83\xEC\x30\x48\x8B\x05\x00\x00\x00\x00\x0F\xB6\xE9", "xxxxxxxxx????xxx");
void (*DrawAllOverlays)(char a1) = (void (*)(char))p_DrawAllOverlays.GetPtr(); /*40 55 48 83 EC 30 48 8B 05 ? ? ? ? 0F B6 E9*/
#endif
}
///////////////////////////////////////////////////////////////////////////////
class HDebugOverlay : public IDetour
{
virtual void debugp()
{
std::cout << "| FUN: DrawAllOverlays : 0x" << std::hex << std::uppercase << p_DrawAllOverlays.GetPtr() << std::setw(npad) << " |" << std::endl;
std::cout << "+----------------------------------------------------------------+" << std::endl;
}
};
///////////////////////////////////////////////////////////////////////////////
void DebugOverlays_Init();
REGISTER(HDebugOverlay);

4
r5dev/launcher/IApplication.cpp
View File

@ -16,6 +16,10 @@ void* HIApplication_Main(void* a1, void* a2)
//-----------------------------------------------------------------------------
bool HIApplication_Create(void* a1)
{
#ifdef DEDICATED
// TODO: Don't hardcode!
* (uintptr_t*)0x162C61208 = 0x1; // g_bDedicated
#endif // DEDICATED
return IAppSystem_Create(a1);
}

4
r5dev/r5dev.vcxproj
View File

@ -33,7 +33,6 @@
<ClCompile Include="ebisusdk\EbisuSDK.cpp" />
<ClCompile Include="engine\baseclient.cpp" />
<ClCompile Include="engine\baseclientstate.cpp" />
<ClCompile Include="engine\debugoverlay.cpp" />
<ClCompile Include="engine\host_cmd.cpp" />
<ClCompile Include="engine\host_state.cpp" />
<ClCompile Include="engine\net_chan.cpp" />
@ -110,6 +109,7 @@
<ClCompile Include="windows\console.cpp" />
<ClCompile Include="windows\id3dx.cpp" />
<ClCompile Include="windows\input.cpp" />
<ClCompile Include="windows\system.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="bsplib\bsplib.h" />
@ -126,7 +126,6 @@
<ClInclude Include="ebisusdk\EbisuSDK.h" />
<ClInclude Include="engine\baseclient.h" />
<ClInclude Include="engine\baseclientstate.h" />
<ClInclude Include="engine\debugoverlay.h" />
<ClInclude Include="engine\host_cmd.h" />
<ClInclude Include="engine\host_state.h" />
<ClInclude Include="engine\net_chan.h" />
@ -291,6 +290,7 @@
<ClInclude Include="windows\console.h" />
<ClInclude Include="windows\id3dx.h" />
<ClInclude Include="windows\input.h" />
<ClInclude Include="windows\system.h" />
</ItemGroup>
<ItemGroup>
<None Include="r5dev.def" />

8
r5dev/r5dev.vcxproj.filters
View File

@ -303,8 +303,8 @@
<ClCompile Include="engine\host_cmd.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
<ClCompile Include="engine\debugoverlay.cpp">
<Filter>sdk\engine</Filter>
<ClCompile Include="windows\system.cpp">
<Filter>windows</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
@ -842,8 +842,8 @@
<ClInclude Include="engine\host_cmd.h">
<Filter>sdk\engine</Filter>
</ClInclude>
<ClInclude Include="engine\debugoverlay.h">
<Filter>sdk\engine</Filter>
<ClInclude Include="windows\system.h">
<Filter>windows</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>

4
r5dev/windows/input.cpp
View File

@ -25,7 +25,7 @@ extern BOOL g_bBlockInput = false;
// INITIALIZATION
//#############################################################################
void SetupIPHooks()
void Input_Setup()
{
g_oSetCursorPos = (ISetCursorPos)DetourFindFunction("user32.dll", "SetCursorPos");
g_oClipCursor = (IClipCursor )DetourFindFunction("user32.dll", "ClipCursor" );
@ -87,7 +87,7 @@ BOOL WINAPI HShowCursor(BOOL bShow)
void Input_Init()
{
SetupIPHooks();
Input_Setup();
///////////////////////////////////////////////////////////////////////////
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());

56
r5dev/windows/system.cpp Normal file
View File

@ -0,0 +1,56 @@
#include "core/stdafx.h"
#include "windows/system.h"
///////////////////////////////////////////////////////////////////////////////
typedef BOOL(WINAPI* IGetVersionExA)(_Inout_ LPOSVERSIONINFOA lpVersionInformation);
static IGetVersionExA g_oGetVersionExA = nullptr;
//#############################################################################
// SYSTEM HOOKS
//#############################################################################
BOOL WINAPI HGetVersionExA(_Inout_ LPOSVERSIONINFOA lpVersionInformation)
{
#ifdef DEDICATED
// Return false for dedicated to skip 'SetPRocessDpiAwareness' in 'CEngineAPI:OnStartup()'.
return NULL;
#else
return g_oGetVersionExA(lpVersionInformation);
#endif // DEDICATED
}
//#############################################################################
// MANAGEMENT
//#############################################################################
void WinSys_Init()
{
g_oGetVersionExA = (IGetVersionExA)DetourFindFunction("KERNEL32.dll", "GetVersionExA");
}
void WinSys_Attach()
{
WinSys_Init();
///////////////////////////////////////////////////////////////////////////
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
///////////////////////////////////////////////////////////////////////////
DetourAttach(&(LPVOID&)g_oGetVersionExA, (PBYTE)HGetVersionExA);
///////////////////////////////////////////////////////////////////////////
DetourTransactionCommit();
}
void WinSys_Detach()
{
///////////////////////////////////////////////////////////////////////////
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
///////////////////////////////////////////////////////////////////////////
DetourDetach(&(LPVOID&)g_oGetVersionExA, (PBYTE)HGetVersionExA);
///////////////////////////////////////////////////////////////////////////
DetourTransactionCommit();
}

4
r5dev/windows/system.h Normal file
View File

@ -0,0 +1,4 @@
#pragma once
void WinSys_Attach();
void WinSys_Detach();