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

Made the previous commit less hacky

Browse Source
This commit is contained in:
NovaRain
2026-07-05 18:34:27 +08:00
parent 44317731ca
commit 68768d31a0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/Inventory.cpp
+3 -2
View File
@@ -348,11 +348,11 @@ static __declspec(naked) void item_identical_hack() {
static const DWORD item_identical_End = 0x477AD5;
using namespace fo;
__asm { // edx - inv_item.inventory, edi - place_item.inventory
pop ebx; // ret addr
cmp dword ptr [eax + 0x20], item_type_weapon;
je isWeapon;
cmp dword ptr [eax + 0x20], item_type_ammo; // overwritten engine code
jne skip;
add esp, 4;
jmp item_identical_Ret;
isWeapon:
mov ecx, [edx + 0xC]; // inv_item.miscFlags
@@ -362,9 +362,10 @@ isWeapon:
jg skip;
cmp dword ptr [edi + 0x10], 0; // place_item.charges
jg skip;
add esp, 4;
jmp item_identical_End; // return true
skip:
jmp ebx; // check caps pid
retn; // check caps pid
}
}