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 a possible crash in commit dae48e9

Browse Source 
* when the proto does not exist, leading to null object pointer.
This commit is contained in:
NovaRain
2021-03-16 09:21:51 +08:00
parent 4c47977c52
commit 19afef94cc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/BugFixes.cpp
+6 -2
View File
@@ -2865,11 +2865,15 @@ skip:
}
static void __declspec(naked) op_create_object_sid_hack() {
using Scripts::start;
__asm {
mov ebx, [esp + 0x50 - 0x20 + 4]; // createObj
mov edx, 1; // 'start' procedure
test ebx, ebx;
jz noObject;
mov edx, start; // procedure
mov eax, [ebx + scriptId];
call exec_script_proc_;
noObject:
mov edx, ebx;
mov eax, esi;
retn;
@@ -3643,6 +3647,6 @@ void BugFixes_Init()
MakeJump(0x4B6C3B, checkAllRegions_hack);
HookCall(0x4B6C13, checkAllRegions_hook);
// Fix for the script attached to an object not running upon object creation
// Fix for the script attached to an object not being initialized properly upon object creation
MakeCall(0x4551C0, op_create_object_sid_hack, 1);
}