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

Minor edits to Interface.cpp and ddraw.ini

Browse Source
This commit is contained in:
NovaRain
2020-08-22 10:48:46 +08:00
parent d46bb42efd
commit ac4e4c7868
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+1 -1
View File
@@ -698,7 +698,7 @@ NumbersInDialogue=0
WorldMapFontPatch=0 WorldMapFontPatch=0
;Set to 1 to use Fallout's normal text font for death screen subtitles ;Set to 1 to use Fallout's normal text font for death screen subtitles
;Requires changing the color of subtitles in death.pal palette (color index 220) to display the text correctly ;Requires changing the color of subtitles in death.pal palette to white color (index 220) to display the text correctly
DeathScreenFontPatch=0 DeathScreenFontPatch=0
;Set to 1 to keep the selected attack mode when moving the weapon between active item slots ;Set to 1 to keep the selected attack mode when moving the weapon between active item slots
sfall/Modules/Interface.cpp
+10 -9
View File
@@ -718,14 +718,6 @@ static void __declspec(naked) wmInterfaceRefreshCarFuel_hack() {
} }
} }
static void __declspec(naked) main_death_scene_hook() {
__asm {
mov eax, 101;
call fo::funcoffs::text_font_;
jmp fo::funcoffs::debug_printf_;
}
}
static void WorldMapInterfacePatch() { static void WorldMapInterfacePatch() {
BlockCall(0x4C2380); // Remove disabling palette animations (can be used as a place to call a hack function in wmInterfaceInit_) BlockCall(0x4C2380); // Remove disabling palette animations (can be used as a place to call a hack function in wmInterfaceInit_)
@@ -734,6 +726,7 @@ static void WorldMapInterfacePatch() {
HookCall(0x4C2343, wmInterfaceInit_text_font_hook); HookCall(0x4C2343, wmInterfaceInit_text_font_hook);
dlogr(" Done", DL_INIT); dlogr(" Done", DL_INIT);
} }
// Fix images for up/down buttons // Fix images for up/down buttons
SafeWrite32(0x4C2C0A, 199); // index of UPARWOFF.FRM SafeWrite32(0x4C2C0A, 199); // index of UPARWOFF.FRM
SafeWrite8(0x4C2C7C, 0x43); // dec ebx > inc ebx SafeWrite8(0x4C2C7C, 0x43); // dec ebx > inc ebx
@@ -877,6 +870,14 @@ static void __declspec(naked) gmouse_bk_process_hook() {
} }
} }
static void __declspec(naked) main_death_scene_hook() {
__asm {
mov eax, 101;
call fo::funcoffs::text_font_;
jmp fo::funcoffs::debug_printf_;
}
}
void Interface::init() { void Interface::init() {
if (GetConfigInt("Interface", "ActionPointsBar", 0)) { if (GetConfigInt("Interface", "ActionPointsBar", 0)) {
ActionPointsBarPatch(); ActionPointsBarPatch();
@@ -902,7 +903,7 @@ void Interface::init() {
} }
// Corrects the height of the black background for death screen subtitles // Corrects the height of the black background for death screen subtitles
if (hrpIsEnabled == false) SafeWrite32(0x48134D, -602 - (640 * 2)); // main_death_scene_ (shift y-offset 2px up, w/o HRP) if (hrpIsEnabled == false) SafeWrite32(0x48134D, 38 - (640 * 3)); // main_death_scene_ (shift y-offset 2px up, w/o HRP)
if (hrpIsEnabled == false || hrpVersionValid) SafeWrite8(0x481345, 4); // main_death_scene_ if (hrpIsEnabled == false || hrpVersionValid) SafeWrite8(0x481345, 4); // main_death_scene_
if (hrpVersionValid) SafeWrite8(HRPAddress(0x10011738), 10); if (hrpVersionValid) SafeWrite8(HRPAddress(0x10011738), 10);
} }