diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index e667ae17..c951e534 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -110,8 +110,7 @@ FadeMultiplier=100 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX [Interface] ;Set to 1 to expand the number of action points displayed on the interface bar -;Requires new iface_apbar_e.frm in art\intrface\ (included in sfall.dat) to display correctly -;The minimum supported version of the hi-res patch is v4.1.8 +;Requires a new IFACE_APBAR_E.frm in art\intrface\ (included in sfall.dat) to display correctly ActionPointsBar=0 ;Set to 1 to use the expanded barter/trade interface with 4 item slots per table instead of 3 diff --git a/sfall/Modules/ExtraArt.cpp b/sfall/Modules/ExtraArt.cpp index 4ad22d1f..0e098a95 100644 --- a/sfall/Modules/ExtraArt.cpp +++ b/sfall/Modules/ExtraArt.cpp @@ -18,7 +18,6 @@ #include "..\main.h" #include "..\FalloutEngine\Fallout2.h" -#include "..\FalloutEngine\Structs.h" #include "LoadGameHook.h" #include "ExtraArt.h" diff --git a/sfall/Modules/ExtraArt.h b/sfall/Modules/ExtraArt.h index 1f81b23c..cd849c8a 100644 --- a/sfall/Modules/ExtraArt.h +++ b/sfall/Modules/ExtraArt.h @@ -20,18 +20,13 @@ #include "Module.h" -namespace fo -{ - struct FrmFile; -} - -namespace sfall +namespace sfall { struct PcxFile { - unsigned char* pixelData; - long width; - long height; + BYTE* pixelData; + long width; + long height; PcxFile() : pixelData(nullptr), width(0), height(0) {} }; diff --git a/sfall/Modules/Interface.cpp b/sfall/Modules/Interface.cpp index 51e95f4e..281c96ec 100644 --- a/sfall/Modules/Interface.cpp +++ b/sfall/Modules/Interface.cpp @@ -179,13 +179,8 @@ static void APBarRectPatch() { } static void ActionPointsBarPatch() { - dlog("Applying expanded action points bar patch.", DL_INIT); + dlogr("Applying expanded action points bar patch.", DL_INIT); if (HRP::Setting::ExternalEnabled()) { - // check valid data - if (!HRP::Setting::VersionIsValid) { - dlogr(" Incorrect HRP version!", DL_INIT); - return; - } LoadGameHook::OnAfterGameInit() += APBarRectPatch; } else { APBarRectPatch(); @@ -200,7 +195,6 @@ static void ActionPointsBarPatch() { HookCall(0x45D962, intface_init_hook_unlock_iface_frm); MakeCall(0x45E356, intface_init_hack); MakeJump(0x45EE38, intface_update_move_points_hack, 1); - dlogr(" Done", DL_INIT); } static long costAP = -1;