fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when calling proto_data with invalid data member

Browse Source 
(ref. BGforgeNet/Fallout2_Restoration_Project#381)
This commit is contained in:
NovaRain
2026-04-05 08:29:20 +08:00
parent a14f3d14a3
commit a273969756
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/BugFixes.cpp
+16
View File
@@ -3646,6 +3646,19 @@ skip:
}
}
static __declspec(naked) void op_proto_data_hook() {
static const DWORD op_proto_data_Ret = 0x458DEE;
__asm {
call fo::funcoffs::proto_data_member_;
cmp dword ptr [esp + 0x28 - 0x20 + 4], 0; // value pointer
je skip; // unimplemented data member
retn;
skip:
add esp, 4;
jmp op_proto_data_Ret;
}
}
void BugFixes::init() {
#ifndef NDEBUG
LoadGameHook::OnBeforeGameClose() += PrintAddrList;
@@ -4526,6 +4539,9 @@ void BugFixes::init() {
// Fix for getting stuck on an empty map when the encounter table has no available entries
MakeCall(0x4C0DF3, wmRndEncounterPick_hack);
HookCall(0x4C080A, wmRndEncounterOccurred_hook_pick);
// Fix crash when calling proto_data with an invalid data member value
HookCall(0x458DBA, op_proto_data_hook);
}
}