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

Tweaked obj distance check in action_* engine functions

Browse Source 
* use path length instead of tile distance to determine whether to walk
or run to interact with objects.

(ref. fallout2-ce/fallout2-ce#248)
This commit is contained in:
NovaRain
2026-05-31 21:13:26 +08:00
parent e277bbbe9a
commit 96eab6efff
1 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/MiscPatches.cpp
+43 -5
View File
@@ -803,14 +803,52 @@ static void SkipLoadingGameSettingsPatch() {
}
}
static void UseWalkDistancePatch() {
int distance = IniReader::GetConfigInt("Misc", "UseWalkDistance", 3) + 2;
if (distance > 1 && distance < 5) {
dlogr("Applying walk distance for using objects patch.", DL_INIT);
SafeWriteBatch<BYTE>(distance, {0x411E41, 0x411FF0, 0x4121C4, 0x412475, 0x412906}); // default is 5
static int useWalkDist = 5;
static __declspec(naked) void UseWalkDist_hook() {
using namespace fo::Fields;
__asm {
push eax; // source
push edx; // target
call fo::funcoffs::obj_dist_;
cmp eax, useWalkDist;
jge skip; // path will never be shorter than tile distance
cmp eax, 1;
jle skip; // next to target, no need for pathfinding
pop edx;
pop eax;
push ebx;
push ecx;
push 0; // checkTileTo
xor ecx, ecx; // pathDataBuffer
mov ebx, [edx + tile]; // tileTo (target)
mov edx, [eax + tile]; // tileFrom (source)
call fo::funcoffs::make_path_;
pop ecx;
pop ebx;
retn;
skip:
add esp, 8; // stack cleanup
retn;
}
}
static void UseWalkDistancePatch() {
useWalkDist = IniReader::GetConfigInt("Misc", "UseWalkDistance", 3) + 2;
if (useWalkDist > 1 && useWalkDist < 5) {
dlogr("Applying walk distance for using objects patch.", DL_INIT);
SafeWriteBatch<BYTE>(useWalkDist, {0x411E41, 0x411FF0, 0x4121C4, 0x412475, 0x412906}); // default is 5
}
// Use path length instead of tile distance to determine whether to walk or run
HookCalls(UseWalkDist_hook, {
0x411E3A, // action_climb_ladder_
0x411FE9, // action_use_an_item_on_object_
0x4121BD, // action_get_an_object_
0x41246E, // action_loot_container_
0x4128FF // action_use_skill_on_
});
}
static long cMusicArea = -1;
static __declspec(naked) void wmMapMusicStart_hook() {