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 bugs related to knockout/knockdown critters

Browse Source 
Fixed knocked down critters not playing stand up animation after the
combat ends.

Fixed dead NPCs reloading their weapons after the combat ends.
This commit is contained in:
NovaRain
2019-07-06 22:27:06 +08:00
parent 914655085a
commit 32ecdcfdd9
1 changed files with 74 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/BugFixes.cpp
+74 -58
View File
@@ -872,8 +872,7 @@ static void __declspec(naked) action_melee_hack() {
mov edx, 0x4113DC
mov ebx, [eax + artFid] // objStruct->FID
and ebx, 0x0F000000
sar ebx, 0x18
cmp ebx, OBJ_TYPE_CRITTER // check if object FID type flag is set to critter
cmp ebx, OBJ_TYPE_CRITTER << 24 // check if object FID type flag is set to critter
jne end // if object not a critter leave jump condition flags
// set to skip dodge animation
test byte ptr [eax + damageFlags], DAM_KNOCKED_OUT or DAM_KNOCKED_DOWN // (original code)
@@ -889,8 +888,7 @@ static void __declspec(naked) action_ranged_hack() {
mov edx, 0x411B6D
mov ebx, [eax + artFid] // objStruct->FID
and ebx, 0x0F000000
sar ebx, 0x18
cmp ebx, OBJ_TYPE_CRITTER // check if object FID type flag is set to critter
cmp ebx, OBJ_TYPE_CRITTER << 24 // check if object FID type flag is set to critter
jne end // if object not a critter leave jump condition flags
// set to skip dodge animation
test byte ptr [eax + damageFlags], DAM_KNOCKED_OUT or DAM_KNOCKED_DOWN // (original code)
@@ -901,75 +899,90 @@ end:
}
}
static const DWORD SetNewResults_Ret = 0x424FC6;
static void __declspec(naked) set_new_results_hack() {
__asm {
test ah, DAM_KNOCKED_OUT // DAM_KNOCKED_OUT?
jz end // No
mov eax, esi
xor edx, edx
inc edx // type = knockout
jmp fo::funcoffs::queue_remove_this_ // Remove knockout from queue (if there is one)
end:
add esp, 4 // Destroy the return address
jmp SetNewResults_Ret
call fo::funcoffs::stat_level_;
push eax;
mov eax, esi;
xor edx, edx;
inc edx; // type = knockout
call fo::funcoffs::queue_remove_this_; // Remove knockout from queue (if there is one)
pop eax;
retn;
}
}
static void __declspec(naked) critter_wake_clear_hack() {
__asm {
jne end // This is not a critter
mov dl, [esi + damageFlags]
test dl, DAM_DEAD // DAM_DEAD?
jnz end // This is a corpse
and dl, ~DAM_KNOCKED_OUT // 0xFE Unset DAM_KNOCKED_OUT
or dl, DAM_KNOCKED_DOWN // Set DAM_KNOCKED_DOWN
mov [esi + damageFlags], dl
jne end; // This is not a critter
mov dl, [esi + damageFlags];
test dl, DAM_DEAD; // DAM_DEAD?
jnz end; // This is a corpse
and dl, ~DAM_KNOCKED_OUT; // Unset DAM_KNOCKED_OUT
or dl, DAM_KNOCKED_DOWN; // Set DAM_KNOCKED_DOWN
mov [esi + damageFlags], dl;
end:
xor eax, eax
inc eax
pop esi
pop ecx
pop ebx
retn
xor eax, eax;
inc eax;
pop esi;
pop ecx;
pop ebx;
retn; // exit from func
}
}
static const DWORD obj_load_func_Ret = 0x488F14;
static void __declspec(naked) obj_load_func_hack() {
__asm {
test byte ptr [eax+0x25], 0x4 // Temp_
jnz end
mov edi, [eax + protoId]
shr edi, 0x18
cmp edi, OBJ_TYPE_CRITTER
jne skip
test byte ptr [eax + damageFlags], DAM_KNOCKED_DOWN
jz clear // No
pushadc
push ebx
xor ecx, ecx
mov edx, eax // object
mov ebx, ecx // extramem null
mov eax, ecx // time = 0
inc ecx // type = 1
call fo::funcoffs::queue_add_
pop ebx
popadc
test byte ptr [eax + (flags + 1)], 0x4; // Temp_
jz fix;
retn;
fix:
mov edi, [eax + protoId];
and edi, 0x0F000000;
cmp edi, OBJ_TYPE_CRITTER << 24;
jne skip;
test byte ptr [eax + damageFlags], DAM_KNOCKED_OUT;
jnz clear; // Yes
test byte ptr [eax + damageFlags], DAM_KNOCKED_DOWN;
jz clear; // No
push eax;
xor ecx, ecx;
mov edx, eax; // object
mov ebx, ecx; // extramem null
mov eax, ecx; // time = 0
inc ecx; // type = 1
call fo::funcoffs::queue_add_; // run stand up anim
pop eax;
clear:
and word ptr [eax + damageFlags], ~(DAM_LOSE_TURN or DAM_KNOCKED_DOWN) // 0x7FFD
and word ptr [eax + damageFlags], ~(DAM_LOSE_TURN or DAM_KNOCKED_DOWN);
skip:
push 0x488F14
retn
end:
push 0x488EF9
retn
add esp, 4;
jmp obj_load_func_Ret;
}
}
static void __declspec(naked) partyMemberPrepLoadInstance_hook() {
__asm {
and word ptr [eax + damageFlags], ~(DAM_LOSE_TURN or DAM_KNOCKED_DOWN) // 0x7FFD
jmp fo::funcoffs::dude_stand_
and word ptr [eax + damageFlags], ~(DAM_LOSE_TURN or DAM_KNOCKED_DOWN);
jmp fo::funcoffs::dude_stand_;
}
}
static void __declspec(naked) combat_over_hook() {
__asm {
test byte ptr [eax + damageFlags], DAM_DEAD;
jz fix;
retn; // the dead cannot reload their weapons
fix:
test byte ptr [eax + damageFlags], DAM_KNOCKED_DOWN;
jz skip;
push eax;
call fo::funcoffs::dude_standup_;
pop eax;
xor edx, edx;
skip:
jmp fo::funcoffs::cai_attempt_w_reload_;
}
}
@@ -2409,6 +2422,8 @@ void BugFixes::init()
SafeWrite8(0x4415CC, 0x00); // Prevent crashes when re-exporting
dlogr(" Done", DL_INIT);
//}
// Fix for op_lookup_string_proc_ engine function not searching the last procedure in a script
SafeWrite8(0x46C7AC, 0x76); // jb > jbe
//if (GetConfigInt("Misc", "WieldObjCritterFix", 1)) {
dlog("Applying wield_obj_critter fix.", DL_INIT);
@@ -2436,12 +2451,16 @@ void BugFixes::init()
// Fix for "NPC turns into a container" bug
//if (GetConfigInt("Misc", "NPCTurnsIntoContainerFix", 1)) {
dlog("Applying fix for \"NPC turns into a container\" bug.", DL_INIT);
MakeCall(0x424F8E, set_new_results_hack);
MakeJump(0x42E46E, critter_wake_clear_hack);
MakeJump(0x488EF3, obj_load_func_hack);
MakeCall(0x488EF3, obj_load_func_hack, 1);
HookCall(0x4949B2, partyMemberPrepLoadInstance_hook);
dlogr(" Done", DL_INIT);
//}
// Fix for multiple knockout events being added to the queue
HookCall(0x424F9A, set_new_results_hack);
// Fix for knocked down critters not playing stand up animation when the combat ends
// and prevent dead NPCs from reloading their weapons
HookCall(0x421F30, combat_over_hook);
dlog("Applying fix for explosives bugs.", DL_INIT);
// Fix crashes when killing critters with explosives
@@ -2793,9 +2812,6 @@ void BugFixes::init()
// Fix for combat not ending automatically when there are no hostile critters
MakeCall(0x422CF3, combat_should_end_hack);
SafeWrite16(0x422CEA, 0x0C74); // jz 0x422CF8 (skip party members)
// Fix for op_lookup_string_proc_ engine function not searching the last procedure in a script
SafeWrite8(0x46C7AC, 0x76); // jb > jbe
}
}