Rim/iw5-mod
Rim/iw5-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Oops: fix jump step size for mp

Browse Source
This commit is contained in:
FutureRave 2022-03-23 16:03:49 +00:00
parent 01ef5ffff5
commit f0599576b4
No known key found for this signature in database
GPG Key ID: E883E2BC9657D955
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/module/player_movement.cpp
View File

@ -23,6 +23,7 @@ DWORD player_movement::bounce_addr;
DWORD player_movement::dont_bounce_addr; DWORD player_movement::dont_bounce_addr;
DWORD player_movement::push_off_ladder_addr; DWORD player_movement::push_off_ladder_addr;
DWORD player_movement::jump_start_addr; DWORD player_movement::jump_start_addr;
DWORD player_movement::jump_get_step_height_addr;
void player_movement::pm_weapon_use_ammo(game::native::playerState_s* ps, const game::native::Weapon weapon, void player_movement::pm_weapon_use_ammo(game::native::playerState_s* ps, const game::native::Weapon weapon,
bool is_alternate, int amount, game::native::PlayerHandIndex hand) bool is_alternate, int amount, game::native::PlayerHandIndex hand)
@ -261,29 +262,7 @@ __declspec(naked) void player_movement::pm_crash_land_stub_sp()
} }
} }
bool player_movement::jump_get_step_height_stub_mp(game::native::playerState_s* ps, const float* origin, float* step_size) __declspec(naked) void player_movement::jump_get_step_height_stub()
{
assert(ps->pm_flags & game::native::PMF_JUMPING);
assert(origin != nullptr);
assert(step_size != nullptr);
if (origin[2] >= (jump_height->current.value + ps->jumpOriginZ))
{
return false;
}
*step_size = jump_stepSize->current.value;
if (ps->jumpOriginZ + jump_height->current.value < origin[2] + *step_size)
{
*step_size = (ps->jumpOriginZ + jump_height->current.value) - origin[2];
}
return true;
}
// On SP, only a simple patch is required because jump_height is still implemented by the game
__declspec(naked) void player_movement::jump_get_step_height_stub_sp()
{ {
__asm __asm
{ {
@ -292,8 +271,7 @@ __declspec(naked) void player_movement::jump_get_step_height_stub_sp()
fadd dword ptr [eax + 0xC] fadd dword ptr [eax + 0xC]
pop eax pop eax
push 0x48C1FB jmp jump_get_step_height_addr
retn
} }
} }
@ -437,7 +415,8 @@ void player_movement::patch_mp()
utils::hook(0x422BE0, &player_movement::pm_crash_land_stub_mp, HOOK_CALL).install()->quick(); // PM_GroundTrace utils::hook(0x422BE0, &player_movement::pm_crash_land_stub_mp, HOOK_CALL).install()->quick(); // PM_GroundTrace
utils::hook(0x424B2B, &player_movement::jump_get_step_height_stub_mp, HOOK_CALL).install()->quick(); // PM_StepSlideMove utils::hook(0x416154, &player_movement::jump_get_step_height_stub, HOOK_JUMP).install()->quick(); // PM_StepSlideMove
utils::hook::nop(0x416159, 1); // Nop skipped opcode
// Modify the hardcoded value of the spread with the value of jump_spreadAdd // Modify the hardcoded value of the spread with the value of jump_spreadAdd
utils::hook(0x4166F0, &player_movement::jump_start_stub, HOOK_JUMP).install()->quick(); utils::hook(0x4166F0, &player_movement::jump_start_stub, HOOK_JUMP).install()->quick();
@ -478,7 +457,7 @@ void player_movement::patch_sp()
utils::hook(0x6442DF, &player_movement::pm_crash_land_stub_sp, HOOK_CALL).install()->quick(); // PM_GroundTrace utils::hook(0x6442DF, &player_movement::pm_crash_land_stub_sp, HOOK_CALL).install()->quick(); // PM_GroundTrace
utils::hook(0x48C1F5, &player_movement::jump_get_step_height_stub_sp, HOOK_JUMP).install()->quick(); // PM_StepSlideMove utils::hook(0x48C1F5, &player_movement::jump_get_step_height_stub, HOOK_JUMP).install()->quick(); // PM_StepSlideMove
utils::hook::nop(0x48C1FA, 1); // Nop skipped opcode utils::hook::nop(0x48C1FA, 1); // Nop skipped opcode
// Modify the hardcoded value of the spread with the value of jump_spreadAdd // Modify the hardcoded value of the spread with the value of jump_spreadAdd
@ -502,6 +481,7 @@ void player_movement::post_load()
player_movement::dont_bounce_addr = SELECT_VALUE(0x43D933, 0x424D6C, 0x0); player_movement::dont_bounce_addr = SELECT_VALUE(0x43D933, 0x424D6C, 0x0);
player_movement::push_off_ladder_addr = SELECT_VALUE(0x63EA4C, 0x41686C, 0x0); player_movement::push_off_ladder_addr = SELECT_VALUE(0x63EA4C, 0x41686C, 0x0);
player_movement::jump_start_addr = SELECT_VALUE(0x63E910, 0x4166F6, 0x0); player_movement::jump_start_addr = SELECT_VALUE(0x63E910, 0x4166F6, 0x0);
player_movement::jump_get_step_height_addr = SELECT_VALUE(0x48C1FB, 0x41615A, 0x0);
player_movement::pm_bounces = game::native::Dvar_RegisterBool("pm_bounces", false, player_movement::pm_bounces = game::native::Dvar_RegisterBool("pm_bounces", false,
game::native::dvar_flags::DVAR_CODINFO, "CoD4 Bounces"); game::native::dvar_flags::DVAR_CODINFO, "CoD4 Bounces");

4
src/module/player_movement.hpp
View File

@ -24,6 +24,7 @@ private:
static DWORD dont_bounce_addr; static DWORD dont_bounce_addr;
static DWORD push_off_ladder_addr; static DWORD push_off_ladder_addr;
static DWORD jump_start_addr; static DWORD jump_start_addr;
static DWORD jump_get_step_height_addr;
static void pm_weapon_use_ammo(game::native::playerState_s* ps, const game::native::Weapon weapon, static void pm_weapon_use_ammo(game::native::playerState_s* ps, const game::native::Weapon weapon,
bool is_alternate, int amount, game::native::PlayerHandIndex hand); bool is_alternate, int amount, game::native::PlayerHandIndex hand);
@ -70,8 +71,7 @@ private:
static void pm_crash_land_stub_mp(); static void pm_crash_land_stub_mp();
static void pm_crash_land_stub_sp(); static void pm_crash_land_stub_sp();
static bool jump_get_step_height_stub_mp(game::native::playerState_s* ps, const float* origin, float* stepSize); static void jump_get_step_height_stub();
static void jump_get_step_height_stub_sp();
static void jump_start_stub(); static void jump_start_stub();