From 5feeff0c2132aa3f98ab9f635ba8f3c0bc29ba5a Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Thu, 1 Jan 2026 20:23:34 +0800
Subject: [PATCH] Fixed edge-scrolling speed when using the speed tweak

(closes #523)
---
 sfall/Modules/SpeedPatch.cpp | 44 ++++++++++++++++++++++++++++++++++--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/sfall/Modules/SpeedPatch.cpp b/sfall/Modules/SpeedPatch.cpp
index df42a916..76bfa914 100644
--- a/sfall/Modules/SpeedPatch.cpp
+++ b/sfall/Modules/SpeedPatch.cpp
@@ -162,9 +162,47 @@ MMRESULT __stdcall fTimeKillEvent(UINT id) {
 
 static __declspec(naked) void scripts_check_state_hook() {
 	__asm {
-		inc  slideShow;
+		mov  slideShow, 1;
 		call fo::funcoffs::endgame_slideshow_;
-		dec  slideShow;
+		mov  slideShow, 0;
+		retn;
+	}
+}
+
+// same as elapsed_time_ engine function, but bypasses the speed tweak
+static DWORD __fastcall elapsed_time_simple(DWORD start) {
+	DWORD end = GetTickCount();
+	if (end >= start) {
+		return (end - start);
+	} else {
+		return INT_MAX;
+	}
+}
+
+static __declspec(naked) void map_scroll_hook_elapsed_time() {
+	__asm {
+		push ecx;
+		push edx;
+		mov  ecx, eax;
+		call elapsed_time_simple;
+		pop  edx;
+		pop  ecx;
+		retn;
+	}
+}
+
+static DWORD __stdcall GetTickCount2() {
+	return GetTickCount();
+}
+
+// get_time_ engine function is only a wrapper of GetTickCount
+static __declspec(naked) void map_scrall_hook_get_time() {
+	__asm {
+		push ecx;
+		push edx;
+		call GetTickCount2; // bypass speed tweak
+		pop  edx;
+		pop  ecx;
 		retn;
 	}
 }
@@ -220,6 +258,8 @@ void SpeedPatch::init() {
 	}
 	SafeWrite32(0x4FDF58, (DWORD)&getLocalTimeOffs);
 	HookCall(0x4A433E, scripts_check_state_hook);
+	HookCall(0x4826CF, map_scroll_hook_elapsed_time);
+	HookCall(0x4826EB, map_scrall_hook_get_time);
 
 	TimerInit();
 }