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 the position of the ammo bar

Browse Source 
Tweaked the alternative ammo bar to exactly match Mash's.
This commit is contained in:
NovaRain
2023-10-30 21:31:21 +08:00
parent 47d9bb1627
commit 1cca798b80
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/HRP/InterfaceBar.cpp
+2 -2
View File
@@ -396,7 +396,7 @@ static void GetAmmoMetreColors(long yPercent, BYTE &outClr1, BYTE &outClr2) {
static void __fastcall DrawAlternateAmmoMetre(long x, long y) { static void __fastcall DrawAlternateAmmoMetre(long x, long y) {
fo::Window* win = fo::func::GNW_find(fo::var::interfaceWindow); fo::Window* win = fo::func::GNW_find(fo::var::interfaceWindow);
x += xOffset - 2; x += xOffset + 1;
long startOffset = x + (25 * win->width); long startOffset = x + (25 * win->width);
BYTE* surface = win->surface + startOffset; BYTE* surface = win->surface + startOffset;
@@ -452,7 +452,7 @@ static void __fastcall DrawAlternateAmmoMetre(long x, long y) {
fo::BoundRect rect; fo::BoundRect rect;
rect.x = x; rect.x = x;
rect.y = 26; rect.y = 26;
rect.offx = x + 3; rect.offx = x + 4;
rect.offy = 26 + 70; rect.offy = 26 + 70;
fo::func::win_draw_rect(fo::var::interfaceWindow, (RECT*)&rect); fo::func::win_draw_rect(fo::var::interfaceWindow, (RECT*)&rect);
sfall/Modules/BugFixes.cpp
+1 -1
View File
@@ -3313,7 +3313,7 @@ void BugFixes::init() {
SafeWrite8(0x424527, CodeType::JumpShort); // in detemine_to_hit_func_() SafeWrite8(0x424527, CodeType::JumpShort); // in detemine_to_hit_func_()
//} //}
// Fixes for clickability issue in Pip-Boy and exploit that allows to rest in places where you shouldn't be able to rest // Fixes for clickability issue in Pip-Boy and exploit that allows resting in places where you shouldn't be able to
dlogr("Applying fix for Pip-Boy clickability issues and rest exploit.", DL_FIX); dlogr("Applying fix for Pip-Boy clickability issues and rest exploit.", DL_FIX);
MakeCall(0x4971C7, pipboy_hack); MakeCall(0x4971C7, pipboy_hack);
MakeCall(0x499530, PipAlarm_hack); MakeCall(0x499530, PipAlarm_hack);
sfall/Modules/Interface.cpp
+10 -1
View File
@@ -992,12 +992,14 @@ static void __declspec(naked) gmouse_bk_process_hook() {
} }
} }
static long ammoBarXPos = 461; // move ammo bar away from rivets (was 463)
static void __declspec(naked) intface_update_ammo_lights_hack() { static void __declspec(naked) intface_update_ammo_lights_hack() {
__asm { __asm {
mov eax, 70; // 70 - full ammo bar mov eax, 70; // 70 - full ammo bar
cmp edx, eax; cmp edx, eax;
cmovg edx, eax; cmovg edx, eax;
mov eax, 463; // overwritten engine code mov eax, ammoBarXPos; // overwritten engine code
retn; retn;
} }
} }
@@ -1100,6 +1102,13 @@ void Interface::init() {
// Fix crash when the player equips a weapon overloaded with ammo (ammo bar overflow) // Fix crash when the player equips a weapon overloaded with ammo (ammo bar overflow)
MakeCall(0x45F94F, intface_update_ammo_lights_hack); MakeCall(0x45F94F, intface_update_ammo_lights_hack);
// Tweak for ammo bar position with HRP by Mash
if (HRP::Setting::ExternalEnabled()) {
ammoBarXPos = 465;
if (IniReader::GetInt("IFACE", "ALTERNATE_AMMO_METRE", 0, ".\\f2_res.ini")) {
ammoBarXPos -= 2;
}
}
} }
void Interface::exit() { void Interface::exit() {