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 HOOK_REMOVEINVENOBJ not being triggered

Browse Source 
* when using drug/misc item from active item slots (closes #623)
This commit is contained in:
NovaRain
2026-04-21 21:25:53 +08:00
parent 9c6d7bfdd2
commit 91cc37dc17
1 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/HookScripts/InventoryHs.cpp
+53 -1
View File
@@ -72,6 +72,54 @@ skipHook:
} }
} }
static __declspec(naked) void inven_action_cursor_hack_drug() {
__asm {
push ebx; // item slot
call BeginHook;
mov eax, [esp + 0x6C - 0x5C + 8];
mov args[0], eax; // source
mov edx, [esp + 0x6C - 0x50 + 8];
mov args[4], edx; // item
mov args[8], 1; // count
mov args[12], 0x473594; // RMOBJ_CONSUME_DRUG
mov args[16], 0; // target
}
argCount = 5;
RunHookScript(HOOK_REMOVEINVENOBJ);
EndHook();
__asm {
pop ebx;
mov dword ptr [ebx], 0; // overwritten engine code
retn;
}
}
static __declspec(naked) void inven_action_cursor_hack_misc() {
__asm {
push edx; // item slot
call BeginHook;
mov eax, [esp + 0x6C - 0x5C + 8];
mov args[0], eax; // source
mov edx, [esp + 0x6C - 0x50 + 8];
mov args[4], edx; // item
mov args[8], 1; // count
mov args[12], 0x4735F1; // RMOBJ_USE_OBJ
mov args[16], 0; // target
}
argCount = 5;
RunHookScript(HOOK_REMOVEINVENOBJ);
EndHook();
__asm {
pop edx;
mov dword ptr [edx], 0; // overwritten engine code
retn;
}
}
static __declspec(naked) void MoveCostHook() { static __declspec(naked) void MoveCostHook() {
__asm { __asm {
HookBegin; HookBegin;
@@ -650,7 +698,11 @@ static void AdjustFidHook(DWORD vanillaFid) {
} }
void Inject_RemoveInvenObjHook() { void Inject_RemoveInvenObjHook() {
MakeJump(0x477492, RemoveObjHook); // old 0x477490 MakeJump(0x477492, RemoveObjHook); // item_remove_mult_ (old 0x477490)
// Special case: use a drug/misc item from active item slots while in the inventory screen
// Item removal does not go through item_remove_mult_ engine function
MakeCall(0x473596, inven_action_cursor_hack_drug, 1);
MakeCall(0x473631, inven_action_cursor_hack_misc, 1);
} }
void Inject_MoveCostHook() { void Inject_MoveCostHook() {