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 infinite loop in combat with AIDrugUsePerfFix

Browse Source
This commit is contained in:
NovaRain
2021-06-08 07:05:07 +08:00
parent ff324c304f
commit 38abea7fc1
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/BugFixes.cpp
+8 -7
View File
@@ -2019,35 +2019,36 @@ skip:
static DWORD firstItemDrug = -1;
// when there are no more items in the inventory
static void __declspec(naked) ai_check_drugs_hack_break() {
static const DWORD ai_check_drugs_hack_Ret = 0x42878B;
__asm {
mov eax, -1;
cmp firstItemDrug, eax;
jne firstDrugs; // pid != -1
jne useDrugs; // pid != -1
add esp, 4;
jmp ai_check_drugs_hack_Ret; // break loop
firstDrugs:
useDrugs: // use the first found item
mov dword ptr [esp + 4], eax; // slot set -1
mov edi, firstItemDrug;
mov ebx, edi;
mov firstItemDrug, eax; // set -1
retn; // use drug
retn; // goto check (use drug)
}
}
static void __declspec(naked) ai_check_drugs_hack_check() {
__asm {
test [esp + 0x34 - 0x30 + 4], 0; // check NoInvenItem != 0
jnz skip;
test [esp + 0x34 - 0x30 + 4], 1; // check NoInvenItem != 0
jnz skip; // there are no more drugs in inventory
cmp dword ptr [edx + 0xAC], -1; // cap.chem_primary_desire (Chemical Preference Number)
jnz checkDrugs;
skip:
xor ebx, ebx; // set ZF for skipping preference list check
retn;
checkDrugs:
cmp ebx, [edx + 0xAC]; // check item.pid against cap.chem_primary_desire
retn;
cmp ebx, [edx + 0xAC]; // item.pid == cap.chem_primary_desire?
retn; // if yes, use it (jz 0x4286C7); otherwise, check the other values of chem_primary_desire
}
}