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

invenWieldFunc fix for putting non-armor, non-weapon items into hand slot

Browse Source
This commit is contained in:
phobos2077
2023-06-11 20:12:11 +02:00
parent e9f8984819
commit d107edbb23
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/Inventory.cpp
+26
View File
@@ -626,6 +626,29 @@ void InventoryReset() {
invenApCost = invenApCostDef; invenApCost = invenApCostDef;
} }
// Allows to pass items of non-armor and non-weapon type to invenWieldFunc without error
// It used to treat all non-armor items as "weapon" and try to check if critter had weapon animation,
// which isn't valid for other item subtypes.
static void __declspec(naked) invenWieldFunc_hack() {
static const DWORD invenWieldFunc_hack_back = 0x47285D;
static const DWORD invenWieldFunc_hack_skip = 0x4728A7;
using namespace fo;
using namespace Fields;
__asm {
mov eax, edi; // weapon
call fo::funcoffs::item_get_type_;
cmp eax, item_type_weapon;
je isWeapon;
jmp invenWieldFunc_hack_skip;
isWeapon: // overwritten engine code
mov eax, [esi + rotation]; // cur_rot
inc eax;
push eax;
jmp invenWieldFunc_hack_back;
}
}
void Inventory::init() { void Inventory::init() {
OnKeyPressed() += InventoryKeyPressedHook; OnKeyPressed() += InventoryKeyPressedHook;
LoadGameHook::OnGameReset() += InventoryReset; LoadGameHook::OnGameReset() += InventoryReset;
@@ -742,6 +765,9 @@ void Inventory::init() {
// Note: the flag is not checked for the metarule(METARULE_INVEN_UNWIELD_WHO, x) function // Note: the flag is not checked for the metarule(METARULE_INVEN_UNWIELD_WHO, x) function
HookCall(0x45B0CE, op_inven_unwield_hook); // with fix to update interface slot after unwielding HookCall(0x45B0CE, op_inven_unwield_hook); // with fix to update interface slot after unwielding
HookCall(0x45693C, op_wield_obj_critter_hook); HookCall(0x45693C, op_wield_obj_critter_hook);
// Fix for invenWieldFunc (used by wield_obj_critter) to be able to put non-armor & non-weapon types into active slot.
MakeJump(0x472858, invenWieldFunc_hack);
} }
void Inventory::InvokeAdjustFid(long fid) { void Inventory::InvokeAdjustFid(long fid) {