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 ONDEATH hook being incorrectly triggered by non-critter objects

Browse Source 
(when calling kill_critter on a non-critter obj)
This commit is contained in:
NovaRain
2026-04-17 23:05:56 +08:00
parent 81e612f383
commit e3a133e3aa
1 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/HookScripts/DeathHs.cpp
+6 -25
View File
@@ -95,32 +95,11 @@ static __declspec(naked) void CalcDeathAnim2Hook() {
}
static __declspec(naked) void OnDeathHook() {
using namespace fo::Fields;
__asm {
push edx;
call BeginHook;
mov args[0], esi;
}
argCount = 1;
RunHookScript(HOOK_ONDEATH);
EndHook();
__asm {
pop edx;
// engine code
mov eax, [esi + protoId];
mov ebp, ebx;
retn;
}
}
static __declspec(naked) void OnDeathHook2() {
__asm {
call fo::funcoffs::partyMemberRemove_;
HookBegin;
mov args[0], esi;
pushadc;
call BeginHook;
mov args[0], esi;
}
argCount = 1;
@@ -151,8 +130,10 @@ void Inject_DeathAnim2Hook() {
}
void Inject_OnDeathHook() {
MakeCall(0x42DA6D, OnDeathHook); // critter_kill_
HookCall(0x425161, OnDeathHook2); // damage_object_
HookCalls(OnDeathHook, {
0x42DA8A, // critter_kill_
0x425161 // damage_object_
});
}
void InitDeathHookScripts() {