Skip to content

Commit b8b63de

Browse files
authored
Fix "Climbing over certain objects kills you" (#4395)
1 parent e02a473 commit b8b63de

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Client/multiplayer_sa/CMultiplayerSA.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,10 +1563,10 @@ void CMultiplayerSA::InitHooks()
15631563
MemCpy((void*)0x7259B0, "\xDD\xD8\x90", 3);
15641564
MemSet((void*)0x7258B8, 0x90, 6);
15651565

1566-
// Disable spreading fires (Moved from multiplayer_shotsync)
1566+
// Disable spreading fires (Moved from multiplayer_shotsync)
15671567
MemCpy((void*)0x53A23F, "\x33\xC0\x90\x90\x90", 5);
15681568
MemCpy((void*)0x53A00A, "\x33\xC0\x90\x90\x90", 5);
1569-
1569+
15701570
InitHooks_CrashFixHacks();
15711571
InitHooks_DeviceSelection();
15721572

Client/multiplayer_sa/CMultiplayerSA_FrameRateFixes.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,12 @@ void CMultiplayerSA::InitHooks_FrameRateFixes()
798798
// CVehicle::ProcessBoatControl
799799
MemPut(0x6DC23F, &kOriginalTimeStep);
800800

801+
// Fixes climbing over certain objects killing player on high FPS or low game speed.
802+
// GitHub Issue #602
803+
MemPut(0x6811E9, &kOriginalTimeStep);
804+
MemPut(0x68128A, &kOriginalTimeStep);
805+
MemPut(0x68131B, &kOriginalTimeStep);
806+
801807
// CTimer::m_FrameCounter fixes
802808
EZHookInstall(CTimer__Update);
803809

0 commit comments

Comments
 (0)