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

Fix redefinition compiler error

Browse Source
This commit is contained in:
Amos 2021-10-24 13:37:43 -07:00
parent 6fb9e8004a
commit 877fb9a077
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
r5dedicated/opcodes.cpp
View File

@ -42,7 +42,7 @@ void Hooks::DedicatedPatch()
gCEngineAPI__Connect.Offset(0xF1).Patch({ 0x90, 0x90, 0x90, 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(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(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. //gCEngineAPI__ModInit.Offset(0x3DD).Patch({ 0xEB, 0x6D }); // JE --> JMP | Skip CreateGameWindow initialization code.
//------------------------------------------------------------------------- //-------------------------------------------------------------------------

1
r5dedicated/opcodes.h
View File

@ -93,7 +93,6 @@ namespace
MemoryAddress gCHLClient__1000 = 0x00000001405C27B0; // CHLClient + 1000 MemoryAddress gCHLClient__1000 = 0x00000001405C27B0; // CHLClient + 1000
MemoryAddress gCHLClient__HudMessage = 0x00000001405BAC00; // CHudMessage MemoryAddress gCHLClient__HudMessage = 0x00000001405BAC00; // CHudMessage
MemoryAddress c6 = 0x00000001403CA2D0; // MemoryAddress c6 = 0x00000001403CA2D0; //
MemoryAddress gCEngineAPI__ModInit = 0x0000000140343DE0;
// VGUI // VGUI
MemoryAddress gCEngineVGui__Init = 0x0000000140282E40; // jumptable MemoryAddress gCEngineVGui__Init = 0x0000000140282E40; // jumptable