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

maint: fix all angles bounces

Browse Source
This commit is contained in:
Diavolo 2023-02-22 11:48:03 +01:00
parent 0f42cfbbdf
commit 282f56ed5f
No known key found for this signature in database
GPG Key ID: FA77F074E98D98A5
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/module/gsc/script_loading.cpp
View File

@ -61,7 +61,7 @@ namespace gsc
console::info("Decompiling scriptfile '%s'\n", real_name.data()); console::info("Decompiling scriptfile '%s'\n", real_name.data());
const std::string stack{script_file->buffer, static_cast<std::uint32_t>(script_file->len)}; const std::string stack{ script_file->buffer, static_cast<std::uint32_t>(script_file->len) };
const auto decompressed_stack = utils::compression::zlib::decompress(stack); const auto decompressed_stack = utils::compression::zlib::decompress(stack);
std::vector<std::uint8_t> stack_data; std::vector<std::uint8_t> stack_data;

27
src/module/player_movement.cpp
View File

@ -26,6 +26,7 @@ const game::native::dvar_t* player_movement::bg_gravity;
const game::native::dvar_t* player_movement::g_speed; const game::native::dvar_t* player_movement::g_speed;
DWORD player_movement::bounce_addr; DWORD player_movement::bounce_addr;
DWORD player_movement::all_angles_bounce_addr;
DWORD player_movement::dont_bounce_addr; DWORD player_movement::dont_bounce_addr;
DWORD player_movement::pm_project_velocity_addr; DWORD player_movement::pm_project_velocity_addr;
DWORD player_movement::pm_end_sprint_addr; DWORD player_movement::pm_end_sprint_addr;
@ -56,13 +57,22 @@ __declspec(naked) void player_movement::pm_step_slide_move_stub()
// Code hook skipped // Code hook skipped
cmp dword ptr [esp + 0x24], 0 cmp dword ptr [esp + 0x24], 0
jnz dont_bounce jmp dont_bounce_addr
bounce: bounce:
push eax
mov eax, pm_bouncesAllAngles
cmp byte ptr [eax + 0xC], 1
pop eax
je all_angles_bounce
// Regular bounce
jmp bounce_addr jmp bounce_addr
dont_bounce: all_angles_bounce:
jmp dont_bounce_addr // Patch for all angles
jmp all_angles_bounce_addr
} }
} }
@ -373,15 +383,15 @@ __declspec(naked) void player_movement::pm_project_velocity_stub()
cmp byte ptr [eax + 0xC], 1 cmp byte ptr [eax + 0xC], 1
pop eax pop eax
je bounce je force_bounce
fstp ST(0) fstp ST(0)
pop esi pop esi
add esp, 0x10 add esp, 0x10
retn retn
bounce: force_bounce:
jmp dont_bounce_addr jmp pm_project_velocity_addr
} }
} }
@ -688,8 +698,9 @@ void player_movement::post_load()
utils::hook::set<BYTE>(SELECT_VALUE(0x44DFED, 0x50DDDD), 0x0); utils::hook::set<BYTE>(SELECT_VALUE(0x44DFED, 0x50DDDD), 0x0);
bounce_addr = SELECT_VALUE(0x43D91F, 0x424D58); bounce_addr = SELECT_VALUE(0x43D91F, 0x424D58);
dont_bounce_addr = SELECT_VALUE(0x43D933, 0x424D6C); all_angles_bounce_addr = SELECT_VALUE(0x43D968, 0x424DA1);
pm_project_velocity_addr = SELECT_VALUE(0x4A57Ef, 0x41D19F); dont_bounce_addr = SELECT_VALUE(0x43D91D, 0x424D56);
pm_project_velocity_addr = SELECT_VALUE(0x4A57EF, 0x41D19F);
pm_end_sprint_addr = SELECT_VALUE(0x0, 0x41D350); pm_end_sprint_addr = SELECT_VALUE(0x0, 0x41D350);
push_off_ladder_addr = SELECT_VALUE(0x63EA4C, 0x41686C); push_off_ladder_addr = SELECT_VALUE(0x63EA4C, 0x41686C);
jump_start_addr = SELECT_VALUE(0x63E910, 0x4166F6); jump_start_addr = SELECT_VALUE(0x63E910, 0x4166F6);

1
src/module/player_movement.hpp
View File

@ -31,6 +31,7 @@ private:
static const game::native::dvar_t* g_speed; static const game::native::dvar_t* g_speed;
static DWORD bounce_addr; static DWORD bounce_addr;
static DWORD all_angles_bounce_addr;
static DWORD dont_bounce_addr; static DWORD dont_bounce_addr;
static DWORD pm_project_velocity_addr; static DWORD pm_project_velocity_addr;
static DWORD pm_end_sprint_addr; static DWORD pm_end_sprint_addr;