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 pickup_obj/drop_obj/use_obj script functions (from Mr.Stalin)

Browse Source 
Fixed a crash when calling use_obj/use_obj_on_obj functions without using set_self in global scripts.
This commit is contained in:
NovaRain
2019-01-25 00:31:23 +08:00
parent 42566cc9da
commit 8e0ccc576c
2 changed files with 49 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/scripting/sfall function notes.txt
+1 -1
View File
@@ -165,7 +165,7 @@ array - array ID to be used with array-related functions (actually an integer)
- self_obj will revert back to its original value after the next function call. - self_obj will revert back to its original value after the next function call.
- calling self_obj(0) will also revert self_obj to original value. It is recommended to call this after each use of set_self in normal scripts in order to avoid unforeseen side effects. - calling self_obj(0) will also revert self_obj to original value. It is recommended to call this after each use of set_self in normal scripts in order to avoid unforeseen side effects.
- source_obj, target_obj, and similar functions will not work if preceded by "set_self" - source_obj, target_obj, and similar functions will not work if preceded by "set_self"
- NOTE: for use_obj_on_obj vanilla function to work correctly, it is required to call set_self twice. - NOTE: for use_obj/use_obj_on_obj vanilla functions to work correctly, it is required to call set_self twice.
> void mod_skill_points_per_level(int x) > void mod_skill_points_per_level(int x)
- accepts a value of between -100 and 100, and modifies the number of skill points the player receives when they level up. - accepts a value of between -100 and 100, and modifies the number of skill points the player receives when they level up.
sfall/Bugs.cpp
+48 -3
View File
@@ -12,10 +12,17 @@ static DWORD weightOnBody = 0;
static char textBuf[355]; static char textBuf[355];
static const DWORD ScriptTargetAddr[] = {
0x456554, // op_pickup_obj_
0x456600, // op_drop_obj_
0x456A6D, // op_use_obj_
0x456AA4, // op_use_obj_
};
void ResetBodyState() { void ResetBodyState() {
_asm mov critterBody, 0; __asm mov critterBody, 0;
_asm mov sizeOnBody, 0; __asm mov sizeOnBody, 0;
_asm mov weightOnBody, 0; __asm mov weightOnBody, 0;
} }
void GameInitialization() { void GameInitialization() {
@@ -1737,6 +1744,34 @@ static void __declspec(naked) op_attack_hook() {
} }
} }
static void __declspec(naked) op_use_obj_on_obj_hack() {
__asm {
test eax, eax;
jz fail;
mov edx, [eax + 0x64]; // source
shr edx, 24;
retn;
fail:
add esp, 4;
mov edx, 0x45C3A3; // exit func
jmp edx;
}
}
static void __declspec(naked) op_use_obj_hack() {
__asm {
test eax, eax;
jz fail;
mov edx, [eax + 0x64]; // source
shr edx, 24;
retn;
fail:
add esp, 4;
mov edx, 0x456ABA; // exit func
jmp edx;
}
}
void BugsInit() void BugsInit()
{ {
@@ -2207,4 +2242,14 @@ void BugsInit()
SafeWrite8(0x456D98, 0x94); // setnz > setz (fix setting result flags) SafeWrite8(0x456D98, 0x94); // setnz > setz (fix setting result flags)
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
// Fix crash when calling use_obj/use_obj_on_obj without using set_self in global scripts
MakeCall(0x45C376, op_use_obj_on_obj_hack, 1);
MakeCall(0x456A92, op_use_obj_hack, 1);
// Fix pickup_obj/drop_obj/use_obj functions, change them to get pointer from script.self instead of script.target
// script.target contains an incorrect pointer, which may vary depending on the situations in the game
for (int i = 0; i < sizeof(ScriptTargetAddr) / 4; i++) {
SafeWrite8(ScriptTargetAddr[i], 0x34); // script.target > script.self
}
} }