Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #143 from diamante0018/quick-patch-refactor-2

Browse Source 
[QuickPatch] Quick Refactor
This commit is contained in:
Dss0 2021-11-11 17:57:21 +01:00 committed by GitHub
commit ff2b109aa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Components/Modules/QuickPatch.cpp
View File

@ -3,6 +3,7 @@
namespace Components namespace Components
{ {
int QuickPatch::FrameTime = 0; int QuickPatch::FrameTime = 0;
Dvar::Var QuickPatch::r_customAspectRatio;
void QuickPatch::UnlockStats() void QuickPatch::UnlockStats()
{ {
@ -139,16 +140,15 @@ namespace Components
} }
} }
bool QuickPatch::InvalidNameCheck(char *dest, char *source, int size) bool QuickPatch::InvalidNameCheck(char* dest, const char* source, int size)
{ {
strncpy(dest, source, size - 1); Utils::Hook::Call<void(char*, const char*, int)>(0x4D6F80)(dest, source, size); // I_strncpyz
dest[size - 1] = 0;
for (int i = 0; i < size - 1; i++) for (int i = 0; i < size - 1; i++)
{ {
if (!dest[i]) break; if (!dest[i]) break;
if (dest[i] > 125 || dest[i] < 32 || dest[i] == '%') if (dest[i] > 125 || dest[i] < 32 || dest[i] == '%')
{ {
return false; return false;
} }
@ -172,7 +172,7 @@ namespace Components
push 1; push 1;
push kick_reason; push kick_reason;
push edi; push edi;
mov eax, 0x004D1600; mov eax, 0x004D1600; // SV_DropClientInternal
call eax; call eax;
add esp, 12; add esp, 12;
popad; popad;
@ -184,7 +184,6 @@ namespace Components
} }
Game::dvar_t* QuickPatch::g_antilag; Game::dvar_t* QuickPatch::g_antilag;
__declspec(naked) void QuickPatch::ClientEventsFireWeaponStub() __declspec(naked) void QuickPatch::ClientEventsFireWeaponStub()
{ {
__asm __asm
@ -268,30 +267,31 @@ namespace Components
} }
} }
Game::dvar_t* QuickPatch::r_customAspectRatio;
Game::dvar_t* QuickPatch::Dvar_RegisterAspectRatioDvar(const char* name, char**, int defaultVal, int flags, const char* description) Game::dvar_t* QuickPatch::Dvar_RegisterAspectRatioDvar(const char* name, char**, int defaultVal, int flags, const char* description)
{ {
static std::vector < char * > values = static const char* r_aspectRatioEnum[] =
{ {
const_cast<char*>("auto"), "auto",
const_cast<char*>("standard"), "standard",
const_cast<char*>("wide 16:10"), "wide 16:10",
const_cast<char*>("wide 16:9"), "wide 16:9",
const_cast<char*>("custom"), "custom",
nullptr, nullptr
}; };
// register custom aspect ratio dvar // register custom aspect ratio dvar
r_customAspectRatio = Game::Dvar_RegisterFloat("r_customAspectRatio", 16.0f / 9.0f, 4.0f / 3.0f, 63.0f / 9.0f, flags, "Screen aspect ratio. Divide the width by the height in order to get the aspect ratio value. For example: 16 / 9 = 1,77"); QuickPatch::r_customAspectRatio = Dvar::Register<float>("r_customAspectRatio",
16.0f / 9.0f, 4.0f / 3.0f, 63.0f / 9.0f, flags,
"Screen aspect ratio. Divide the width by the height in order to get the aspect ratio value. For example: 16 / 9 = 1,77");
// register enumeration dvar // register enumeration dvar
return Game::Dvar_RegisterEnum(name, values.data(), defaultVal, flags, description); return Game::Dvar_RegisterEnum(name, r_aspectRatioEnum, defaultVal, flags, description);
} }
void QuickPatch::SetAspectRatio() void QuickPatch::SetAspectRatio()
{ {
// set the aspect ratio // set the aspect ratio
Utils::Hook::Set<float>(0x66E1C78, r_customAspectRatio->current.value); Utils::Hook::Set<float>(0x66E1C78, r_customAspectRatio.get<float>());
} }
__declspec(naked) void QuickPatch::SetAspectRatioStub() __declspec(naked) void QuickPatch::SetAspectRatioStub()
@ -483,8 +483,8 @@ namespace Components
Utils::Hook(0x578F52, QuickPatch::JavelinResetHookStub, HOOK_JUMP).install()->quick(); Utils::Hook(0x578F52, QuickPatch::JavelinResetHookStub, HOOK_JUMP).install()->quick();
// Add ultrawide support // Add ultrawide support
Utils::Hook(0x0051B13B, QuickPatch::Dvar_RegisterAspectRatioDvar, HOOK_CALL).install()->quick(); Utils::Hook(0x51B13B, QuickPatch::Dvar_RegisterAspectRatioDvar, HOOK_CALL).install()->quick();
Utils::Hook(0x005063F3, QuickPatch::SetAspectRatioStub, HOOK_JUMP).install()->quick(); Utils::Hook(0x5063F3, QuickPatch::SetAspectRatioStub, HOOK_JUMP).install()->quick();
// Make sure preDestroy is called when the game shuts down // Make sure preDestroy is called when the game shuts down
Scheduler::OnShutdown(Loader::PreDestroy); Scheduler::OnShutdown(Loader::PreDestroy);

4
src/Components/Modules/QuickPatch.hpp
View File

@ -28,13 +28,13 @@ namespace Components
static void JavelinResetHookStub(); static void JavelinResetHookStub();
static bool InvalidNameCheck(char *dest, char *source, int size); static bool InvalidNameCheck(char* dest, const char* source, int size);
static void InvalidNameStub(); static void InvalidNameStub();
static Game::dvar_t* sv_enableBounces; static Game::dvar_t* sv_enableBounces;
static void BounceStub(); static void BounceStub();
static Game::dvar_t* r_customAspectRatio; static Dvar::Var r_customAspectRatio;
static Game::dvar_t* Dvar_RegisterAspectRatioDvar(const char* name, char** enumValues, int defaultVal, int flags, const char* description); static Game::dvar_t* Dvar_RegisterAspectRatioDvar(const char* name, char** enumValues, int defaultVal, int flags, const char* description);
static void SetAspectRatioStub(); static void SetAspectRatioStub();
static void SetAspectRatio(); static void SetAspectRatio();

2
src/Game/Functions.hpp
View File

@ -247,7 +247,7 @@ namespace Game
typedef dvar_t* (__cdecl * Dvar_RegisterInt_t)(const char* name, int defaultVal, int min, int max, int flags, const char* description); typedef dvar_t* (__cdecl * Dvar_RegisterInt_t)(const char* name, int defaultVal, int min, int max, int flags, const char* description);
extern Dvar_RegisterInt_t Dvar_RegisterInt; extern Dvar_RegisterInt_t Dvar_RegisterInt;
typedef dvar_t* (__cdecl * Dvar_RegisterEnum_t)(const char* name, char** enumValues, int defaultVal, int flags, const char* description); typedef dvar_t* (__cdecl * Dvar_RegisterEnum_t)(const char* name, const char** enumValues, int defaultVal, int flags, const char* description);
extern Dvar_RegisterEnum_t Dvar_RegisterEnum; extern Dvar_RegisterEnum_t Dvar_RegisterEnum;
typedef dvar_t* (__cdecl * Dvar_RegisterString_t)(const char* name, const char* defaultVal, int, const char*); typedef dvar_t* (__cdecl * Dvar_RegisterString_t)(const char* name, const char* defaultVal, int, const char*);