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

Fix for inventory moving hook - an item drop into container when it is in the slot of the hands. (#167)

Browse Source
This commit is contained in:
Mr.Stalin
2018-06-12 12:13:42 +08:00
committed by NovaRain
parent 177137f2ee
commit d5a38eb3aa
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/HookScripts/InventoryHs.cpp
+14 -6
View File
@@ -115,16 +115,14 @@ skip:
}
}
static const DWORD UseArmorHack_back = 0x4713A9; // normal operation
static const DWORD UseArmorHack_back = 0x4713AF; // normal operation (old 0x4713A9)
static const DWORD UseArmorHack_skip = 0x471481; // skip code, prevent wearing armor
// This hack is called when an armor is dropped into the armor slot at inventory screen
static void _declspec(naked) UseArmorHack() {
__asm {
//previous instruction 'test eax, eax'
jne skip; // not armor
mov ecx, ds:[FO_VAR_i_worn]; // replacement item (override code)
mov edx, [esp + 0x58 - 0x40]; // item
pushad;
mov ecx, ds:[FO_VAR_i_worn]; // replacement item
mov edx, [esp + 0x58 - 0x40 + 32]; // item
push 3; // event: armor slot
call InventoryMoveHook_Script;
cmp eax, -1; // ret value
@@ -227,6 +225,14 @@ skipdrop:
}
}
static const DWORD DropIntoContainerRet = 0x471481;
static void __declspec(naked) DropIntoContainerHandSlotHack() {
__asm {
call fo::funcoffs::drop_into_container_;
jmp DropIntoContainerRet;
}
}
static const DWORD DropAmmoIntoWeaponHack_back = 0x47658D; // proceed with reloading
static const DWORD DropAmmoIntoWeaponHack_return = 0x476643;
static void _declspec(naked) DropAmmoIntoWeaponHack() {
@@ -351,8 +357,10 @@ void InitInventoryHookScripts() {
0x4712E3, // left slot
0x47136D // right slot
});
MakeJump(0x4713A3, UseArmorHack);
MakeJump(0x4713A9, UseArmorHack); // old 0x4713A3
MakeJump(0x476491, DropIntoContainerHack);
MakeJump(0x471338, DropIntoContainerHandSlotHack);
MakeJump(0x4712AB, DropIntoContainerHandSlotHack);
HookCall(0x471200, MoveInventoryHook);
MakeJump(0x476588, DropAmmoIntoWeaponHack);
HookCalls(InvenActionCursorObjDropHook, {