LargoWinchEmpireUnderThreat: Made the fix calculate aspect ratio automatically from the in-game resolution

Author: alphayellow1

project/LargoWinchEmpireUnderThreatFOVFix.vcxproj

@@ -34,7 +34,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
+    <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
@@ -108,9 +108,9 @@
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C>stdclatest</LanguageStandard_C>
       <DebugInformationFormat>None</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
+      <Optimization>MaxSpeed</Optimization>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>

source/fixes/LargoWinchEmpireUnderThreatFOVFix/dllmain.cpp

@@ -26,7 +26,7 @@ HMODULE thisModule;
 
 // Fix details
 std::string sFixName = "LargoWinchEmpireUnderThreatFOVFix";
-std::string sFixVersion = "1.3";
+std::string sFixVersion = "1.4";
 std::filesystem::path sFixPath;
 
 // Ini
@@ -44,8 +44,6 @@ constexpr float fOldAspectRatio = 4.0f / 3.0f;
 
 // Ini variables
 bool bFixActive;
-int iCurrentResX;
-int iCurrentResY;
 float fFOVFactor;
 
 // Variables
@@ -64,8 +62,8 @@ enum class Game
 
 enum CameraFOVInstructionsIndices
 {
-	GameplayFOV,
-	CutscenesFOV
+	Gameplay,
+	Cutscenes
 };
 
 struct GameInfo
@@ -155,25 +153,9 @@ void Configuration()
 	spdlog_confparse(bFixActive);
 
 	// Load resolution from ini
-	inipp::get_value(ini.sections["Settings"], "Width", iCurrentResX);
-	inipp::get_value(ini.sections["Settings"], "Height", iCurrentResY);
 	inipp::get_value(ini.sections["Settings"], "FOVFactor", fFOVFactor);
-	spdlog_confparse(iCurrentResX);
-	spdlog_confparse(iCurrentResY);
 	spdlog_confparse(fFOVFactor);
 
-	// If resolution not specified, use desktop resolution
-	if (iCurrentResX <= 0 || iCurrentResY <= 0)
-	{
-		spdlog::info("Resolution not specified in ini file. Using desktop resolution.");
-		// Implement Util::GetPhysicalDesktopDimensions() accordingly
-		auto desktopDimensions = Util::GetPhysicalDesktopDimensions();
-		iCurrentResX = desktopDimensions.first;
-		iCurrentResY = desktopDimensions.second;
-		spdlog_confparse(iCurrentResX);
-		spdlog_confparse(iCurrentResY);
-	}
-
 	spdlog::info("----------");
 }
 
@@ -195,6 +177,7 @@ bool DetectGame()
 	return false;
 }
 
+static SafetyHookMid ResolutionInstructionsHook{};
 static SafetyHookMid AspectRatioInstructionHook{};
 static SafetyHookMid GameplayFOVInstructionHook{};
 static SafetyHookMid CutscenesFOVInstructionHook{};
@@ -203,9 +186,29 @@ void FOVFix()
 {
 	if (eGameType == Game::LWEUT && bFixActive == true)
 	{
-		fNewAspectRatio = static_cast<float>(iCurrentResX) / static_cast<float>(iCurrentResY);
+		std::uint8_t* ResolutionInstructionsScanResult = Memory::PatternScan(exeModule, "8B 44 24 ?? 8B 4C 24 ?? A3 ?? ?? ?? ?? 89 0D ?? ?? ?? ?? C3 90 90 90 90 90 90 90 90 90 90 90 90 A1");
+		if (ResolutionInstructionsScanResult)
+		{
+			spdlog::info("Resolution Instructions Scan: Address is {:s}+{:x}", sExeName.c_str(), ResolutionInstructionsScanResult - (std::uint8_t*)exeModule);
+
+			ResolutionInstructionsHook = safetyhook::create_mid(ResolutionInstructionsScanResult, [](SafetyHookContext& ctx)
+			{
+				int& iCurrentWidth = Memory::ReadMem(ctx.esp + 0x4);
+
+				int& iCurrentHeight = Memory::ReadMem(ctx.esp + 0x8);
+
+				fNewAspectRatio = static_cast<float>(iCurrentWidth) / static_cast<float>(iCurrentHeight);
 
-		fAspectRatioScale = fNewAspectRatio / fOldAspectRatio;
+				fAspectRatioScale = fNewAspectRatio / fOldAspectRatio;
+
+				ResolutionInstructionsHook.disable();
+			});
+		}
+		else
+		{
+			spdlog::error("Failed to locate resolution instructions scan memory address.");
+			return;
+		}
 
 		std::uint8_t* AspectRatioInstructionScanResult = Memory::PatternScan(exeModule, "D9 44 24 ?? 8B 4C 24 ?? D9 58 ?? D9 44 24");
 		if (AspectRatioInstructionScanResult)
@@ -216,7 +219,7 @@ void FOVFix()
 
 			AspectRatioInstructionHook = safetyhook::create_mid(AspectRatioInstructionScanResult, [](SafetyHookContext& ctx)
 			{
-				float& fCurrentHFOV = *(float*)(ctx.esp + 0x8);
+				float& fCurrentHFOV = Memory::ReadMem(ctx.esp + 0x8);
 
 				fNewHFOV = Maths::CalculateNewHFOV_RadBased(fCurrentHFOV, fAspectRatioScale);
 
@@ -232,13 +235,13 @@ void FOVFix()
 		std::vector<std::uint8_t*> CameraFOVInstructionsScansResult = Memory::PatternScan(exeModule, "D9 41 ?? D9 54 24", "89 48 ?? C3 90 90 90 90 90 90 90 90 90 90 A0");
 		if (Memory::AreAllSignaturesValid(CameraFOVInstructionsScansResult) == true)
 		{
-			spdlog::info("Gameplay FOV Instruction: Address is {:s}+{:x}", sExeName.c_str(), CameraFOVInstructionsScansResult[GameplayFOV] - (std::uint8_t*)exeModule);
+			spdlog::info("Gameplay FOV Instruction: Address is {:s}+{:x}", sExeName.c_str(), CameraFOVInstructionsScansResult[Gameplay] - (std::uint8_t*)exeModule);
 
-			spdlog::info("Cutscenes FOV Instruction: Address is {:s}+{:x}", sExeName.c_str(), CameraFOVInstructionsScansResult[CutscenesFOV] - (std::uint8_t*)exeModule);
+			spdlog::info("Cutscenes FOV Instruction: Address is {:s}+{:x}", sExeName.c_str(), CameraFOVInstructionsScansResult[Cutscenes] - (std::uint8_t*)exeModule);
 
-			Memory::WriteNOPs(CameraFOVInstructionsScansResult[GameplayFOV], 3);
+			Memory::WriteNOPs(CameraFOVInstructionsScansResult[Gameplay], 3);
 
-			GameplayFOVInstructionHook = safetyhook::create_mid(CameraFOVInstructionsScansResult[GameplayFOV], [](SafetyHookContext& ctx)
+			GameplayFOVInstructionHook = safetyhook::create_mid(CameraFOVInstructionsScansResult[Gameplay], [](SafetyHookContext& ctx)
 			{
 				float& fCurrentGameplayFOV = Memory::ReadMem(ctx.ecx + 0x5C);
 
@@ -247,15 +250,15 @@ void FOVFix()
 				FPU::FLD(fNewGameplayFOV);
 			});
 
-			Memory::WriteNOPs(CameraFOVInstructionsScansResult[CutscenesFOV], 3);
+			Memory::WriteNOPs(CameraFOVInstructionsScansResult[Cutscenes], 3);
 
-			CutscenesFOVInstructionHook = safetyhook::create_mid(CameraFOVInstructionsScansResult[CutscenesFOV], [](SafetyHookContext& ctx)
+			CutscenesFOVInstructionHook = safetyhook::create_mid(CameraFOVInstructionsScansResult[Cutscenes], [](SafetyHookContext& ctx)
 			{
-				const float& fCurrentCutscenesFOV = std::bit_cast<float>(ctx.ecx);
+				const float& fCurrentCutscenesFOV = Memory::ReadRegister(ctx.ecx);
 
 				fNewCutscenesFOV = fCurrentCutscenesFOV / fFOVFactor;
 
-				Memory::ReadMem(ctx.eax + 0x5C) = fNewCutscenesFOV;
+				*reinterpret_cast<float*>(ctx.eax + 0x5C) = fNewCutscenesFOV;
 			});
 		}
 	}