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 +/- not updating brightness slider when used on the Pref screen

Browse Source 
(ref. fallout2-ce/fallout2-ce#298)
This commit is contained in:
NovaRain
2026-03-15 07:55:23 +08:00
parent a8490f1913
commit 41fd1e3495
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/FalloutEngine/VariableOffsets.h
+2
View File
@@ -41,6 +41,7 @@
#define FO_VAR_carCurrentArea 0x672E68
#define FO_VAR_carGasAmount 0x672E6C
#define FO_VAR_card_old_fid1 0x5709EC
#define FO_VAR_changed 0x6639A8 // used in the Preferences screen
#define FO_VAR_character_points 0x518538
#define FO_VAR_cmap 0x51DF34
#define FO_VAR_colorTable 0x6A38D0
@@ -287,6 +288,7 @@
#define FO_VAR_pip_win 0x6644C4
#define FO_VAR_pipboy_message_file 0x664348
#define FO_VAR_pipmesg 0x664338
#define FO_VAR_prfwin 0x663904
#define FO_VAR_preload_list_index 0x519640
#define FO_VAR_procTableStrs 0x51C758 // table of procId (from define.h) => procName map
#define FO_VAR_proto_main_msg_file 0x6647FC
sfall/Modules/Interface.cpp
+38 -1
View File
@@ -781,7 +781,7 @@ static void __fastcall wmDetectHotspotHover(long wmMouseX, long wmMouseY) {
static __declspec(naked) void wmWorldMap_hack() {
__asm {
cmp ds:[FO_VAR_In_WorldMap], 1; // player is moving
cmp dword ptr ds:[FO_VAR_In_WorldMap], 1; // player is moving
jne checkHover;
mov eax, dword ptr ds:[FO_VAR_wmWorldOffsetY]; // overwritten code
retn;
@@ -1084,6 +1084,39 @@ skip:
}
}
static __declspec(naked) void IncDecGamma_hack0() {
__asm {
call GetLoopFlags;
test eax, OPTIONS;
jnz inPref;
mov ebx, 0x3FF00000; // overwritten engine code
retn;
inPref:
pop ebx;
add ebx, 39; // offset to next section (0x492916, 0x4929FA)
jmp ebx;
}
}
static __declspec(naked) void IncDecGamma_hack1() {
__asm {
call GetLoopFlags;
test eax, OPTIONS;
jnz inPref;
mov eax, ds:[0x6638D4]; // overwritten engine code
retn;
inPref:
mov eax, 17; // Brightness slider
call fo::funcoffs::UpdateThing_;
mov eax, ds:[FO_VAR_prfwin];
call fo::funcoffs::win_draw_; // redraw the Preferences screen
mov dword ptr ds:[FO_VAR_changed], 1;
pop edx;
add edx, 52; // offset to next section (0x4929BE, 0x492A9E)
jmp edx;
}
}
static __declspec(naked) void display_body_hook() {
__asm {
mov ebx, [esp + 0x60 - 0x28 + 8];
@@ -1444,6 +1477,10 @@ void Interface::init() {
MakeCalls(gdCustomSelect_hack_buttons, {0x44A100, 0x44A151});
MakeCall(0x44A47D, gdCustomSelect_hack_keyretn);
// Fix the +/- keys not updating the brightness slider when used on the Preferences screen
MakeCalls(IncDecGamma_hack0, {0x4928EA, 0x4929CE});
MakeCalls(IncDecGamma_hack1, {0x492985, 0x492A65});
LoadGameHook::OnGameInit() += []() {
// Needs to be invoked in OnGameInit when screen height is already known and db is initialized.
ExpandedBarterPatch();