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

Changed the fix for multihex critter moving in combat to a more proper one.

Browse Source
This commit is contained in:
NovaRain
2018-08-29 09:37:55 +08:00
parent 2974210ad3
commit fac0b73d9e
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/BugFixes.cpp
+32 -4
View File
@@ -613,8 +613,8 @@ static void __declspec(naked) op_wield_obj_critter_adjust_ac_hook() {
static void __declspec(naked) MultiHexFix() { static void __declspec(naked) MultiHexFix() {
__asm { __asm {
xor ecx, ecx; // argument value for make_path_func: ecx=0 (rotation data arg) xor ecx, ecx; // argument value for make_path_func: ecx=0 (rotation data arg)
test byte ptr ds:[ebx+0x25], 0x08; // is target multihex? test [ebx + flags + 1], 0x08; // is target multihex?
mov ebx, dword ptr ds:[ebx+0x4]; // argument value for make_path_func: target's tilenum (end_tile) mov ebx, [ebx + tile]; // argument value for make_path_func: target's tilenum (end_tile)
je end; // skip if not multihex je end; // skip if not multihex
inc ebx; // otherwise, increase tilenum by 1 inc ebx; // otherwise, increase tilenum by 1
end: end:
@@ -622,6 +622,34 @@ end:
} }
} }
static const DWORD ai_move_steps_closer_run_tile_ret = 0x42A155;
static const DWORD ai_move_steps_closer_run_object_ret = 0x42A169;
static void __declspec(naked) MultiHexCombatRunFix() {
__asm {
test [edi + flags + 1], 0x08; // is target multihex?
jnz runObject;
test [esi + flags + 1], 0x08; // is source multihex?
jnz runObject;
jmp ai_move_steps_closer_run_tile_ret;
runObject:
jmp ai_move_steps_closer_run_object_ret;
}
}
static const DWORD ai_move_steps_closer_move_tile_ret = 0x42A17E;
static const DWORD ai_move_steps_closer_move_object_ret = 0x42A192;
static void __declspec(naked) MultiHexCombatMoveFix() {
__asm {
test [edi + flags + 1], 0x08; // is target multihex?
jnz moveObject;
test [esi + flags + 1], 0x08; // is source multihex?
jnz moveObject;
jmp ai_move_steps_closer_move_tile_ret;
moveObject:
jmp ai_move_steps_closer_move_object_ret;
}
}
//checks if an attacked object is a critter before attempting dodge animation //checks if an attacked object is a critter before attempting dodge animation
static void __declspec(naked) action_melee_hack() { static void __declspec(naked) action_melee_hack() {
__asm { __asm {
@@ -1510,8 +1538,8 @@ void BugFixes::init()
MakeCall(0x42901F, MultiHexFix); MakeCall(0x42901F, MultiHexFix);
MakeCall(0x429170, MultiHexFix); MakeCall(0x429170, MultiHexFix);
// Fix for multihex critters moving too close and overlapping their targets in combat // Fix for multihex critters moving too close and overlapping their targets in combat
SafeWrite8(0x42A153, 0xEB); // jmp loc_42A169 (skip register_object_run_to_tile_) MakeJump(0x42A14F, MultiHexCombatRunFix);
SafeWrite8(0x42A17C, 0xEB); // jmp loc_42A192 (skip register_object_move_to_tile_) MakeJump(0x42A178, MultiHexCombatMoveFix);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
//} //}