Skip to content

Fix "Climbing over certain objects kills you" #4395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2025
+8 −2
Merged

Fix "Climbing over certain objects kills you" #4395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Client/multiplayer_sa/CMultiplayerSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1584,10 +1584,10 @@ void CMultiplayerSA::InitHooks()
MemCpy((void*)0x7259B0, "\xDD\xD8\x90", 3);
MemSet((void*)0x7258B8, 0x90, 6);

// Disable spreading fires (Moved from multiplayer_shotsync)
// Disable spreading fires (Moved from multiplayer_shotsync)
MemCpy((void*)0x53A23F, "\x33\xC0\x90\x90\x90", 5);
MemCpy((void*)0x53A00A, "\x33\xC0\x90\x90\x90", 5);

InitHooks_CrashFixHacks();
InitHooks_DeviceSelection();

Expand Down
6 changes: 6 additions & 0 deletions Client/multiplayer_sa/CMultiplayerSA_FrameRateFixes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,12 @@ void CMultiplayerSA::InitHooks_FrameRateFixes()
// CVehicle::ProcessBoatControl
MemPut(0x6DC23F, &kOriginalTimeStep);

// Fixes climbing over certain objects killing player on high FPS or low game speed.
// GitHub Issue #602
MemPut(0x6811E9, &kOriginalTimeStep);
MemPut(0x68128A, &kOriginalTimeStep);
MemPut(0x68131B, &kOriginalTimeStep);

// CTimer::m_FrameCounter fixes
EZHookInstall(CTimer__Update);

Expand Down
Loading