From 282f56ed5fbc448f5dfcdd748374016b08f23c95 Mon Sep 17 00:00:00 2001
From: Diavolo <edoardo.sanguineti222@gmail.com>
Date: Wed, 22 Feb 2023 11:48:03 +0100
Subject: [PATCH] maint: fix all angles bounces

---
 src/module/gsc/script_loading.cpp |  2 +-
 src/module/player_movement.cpp    | 27 +++++++++++++++++++--------
 src/module/player_movement.hpp    |  1 +
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/module/gsc/script_loading.cpp b/src/module/gsc/script_loading.cpp
index e647feb..9082715 100644
--- a/src/module/gsc/script_loading.cpp
+++ b/src/module/gsc/script_loading.cpp
@@ -61,7 +61,7 @@ namespace gsc
 
 			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);
 			std::vector<std::uint8_t> stack_data;
diff --git a/src/module/player_movement.cpp b/src/module/player_movement.cpp
index ec0871b..3d1c16e 100644
--- a/src/module/player_movement.cpp
+++ b/src/module/player_movement.cpp
@@ -26,6 +26,7 @@ const game::native::dvar_t* player_movement::bg_gravity;
 const game::native::dvar_t* player_movement::g_speed;
 
 DWORD player_movement::bounce_addr;
+DWORD player_movement::all_angles_bounce_addr;
 DWORD player_movement::dont_bounce_addr;
 DWORD player_movement::pm_project_velocity_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
 		cmp dword ptr [esp + 0x24], 0
-		jnz dont_bounce
+		jmp dont_bounce_addr
 
 	bounce:
+		push eax
+		mov eax, pm_bouncesAllAngles
+		cmp byte ptr [eax + 0xC], 1
+		pop eax
+
+		je all_angles_bounce
+
+		// Regular bounce
 		jmp bounce_addr
 
-	dont_bounce:
-		jmp dont_bounce_addr
+	all_angles_bounce:
+		// 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
 		pop eax
 
-		je bounce
+		je force_bounce
 
 		fstp ST(0)
 		pop esi
 		add esp, 0x10
 		retn
 
-	bounce:
-		jmp dont_bounce_addr
+	force_bounce:
+		jmp pm_project_velocity_addr
 	}
 }
 
@@ -688,8 +698,9 @@ void player_movement::post_load()
 	utils::hook::set<BYTE>(SELECT_VALUE(0x44DFED, 0x50DDDD), 0x0);
 
 	bounce_addr = SELECT_VALUE(0x43D91F, 0x424D58);
-	dont_bounce_addr = SELECT_VALUE(0x43D933, 0x424D6C);
-	pm_project_velocity_addr = SELECT_VALUE(0x4A57Ef, 0x41D19F);
+	all_angles_bounce_addr = SELECT_VALUE(0x43D968, 0x424DA1);
+	dont_bounce_addr = SELECT_VALUE(0x43D91D, 0x424D56);
+	pm_project_velocity_addr = SELECT_VALUE(0x4A57EF, 0x41D19F);
 	pm_end_sprint_addr = SELECT_VALUE(0x0, 0x41D350);
 	push_off_ladder_addr = SELECT_VALUE(0x63EA4C, 0x41686C);
 	jump_start_addr = SELECT_VALUE(0x63E910, 0x4166F6);
diff --git a/src/module/player_movement.hpp b/src/module/player_movement.hpp
index 52a7192..5d6d768 100644
--- a/src/module/player_movement.hpp
+++ b/src/module/player_movement.hpp
@@ -31,6 +31,7 @@ private:
 	static const game::native::dvar_t* g_speed;
 
 	static DWORD bounce_addr;
+	static DWORD all_angles_bounce_addr;
 	static DWORD dont_bounce_addr;
 	static DWORD pm_project_velocity_addr;
 	static DWORD pm_end_sprint_addr;