added fix PackageAllocateLocation

Author: Perchik71

X-Cell-FO4.vcxproj

@@ -43,6 +43,7 @@
     <ClCompile Include="depends\typeinfo\ms_rtti.cpp" />
     <ClCompile Include="source\xc_assertion.cpp" />
     <ClCompile Include="source\xc_dllmain.cpp" />
+    <ClCompile Include="source\xc_fix_packageallocatelocation.cpp" />
     <ClCompile Include="source\xc_patch.cpp" />
     <ClCompile Include="source\xc_patch_archive_limit.cpp" />
     <ClCompile Include="source\xc_patch_facegen.cpp" />
@@ -81,6 +82,7 @@
     <ClInclude Include="depends\typeinfo\ms_rtti.h" />
     <ClInclude Include="include\xc_assertion.h" />
     <ClInclude Include="include\xc_common.h" />
+    <ClInclude Include="include\xc_fix_packageallocatelocation.h" />
     <ClInclude Include="include\xc_patch.h" />
     <ClInclude Include="include\xc_patch_archive_limit.h" />
     <ClInclude Include="include\xc_patch_facegen.h" />

X-Cell-FO4.vcxproj.filters

@@ -138,6 +138,9 @@
     <ClCompile Include="depends\f4se\f4se\f4se\ScaleformTypes.cpp">
       <Filter>f4se</Filter>
     </ClCompile>
+    <ClCompile Include="source\xc_fix_packageallocatelocation.cpp">
+      <Filter>Исходные файлы\patches</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="depends\f4se\f4se\f4se\GameEvents.h">
@@ -257,6 +260,9 @@
     <ClInclude Include="depends\f4se\f4se\f4se\ScaleformTypes.h">
       <Filter>f4se</Filter>
     </ClInclude>
+    <ClInclude Include="include\xc_fix_packageallocatelocation.h">
+      <Filter>Файлы заголовков\patches</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="depends\f4se\f4se\f4se\GameRTTI.inl">

include/xc_fix_packageallocatelocation.h

@@ -0,0 +1,27 @@
+// Copyright © 2024 aka perchik71. All rights reserved.
+// Contacts: <email:timencevaleksej@gmail.com>
+// License: https://www.gnu.org/licenses/gpl-3.0.html
+
+#pragma once
+
+#include <xc_patch.h>
+
+namespace xc
+{
+	class fix_package_allocate_location : public patch
+	{
+	public:
+		fix_package_allocate_location() = default;
+		fix_package_allocate_location(const fix_package_allocate_location&) = default;
+		virtual ~fix_package_allocate_location() = default;
+
+		fix_package_allocate_location& operator=(const fix_package_allocate_location&) = default;
+
+		static void* sub(void* self);
+
+		virtual const char* get_name() const noexcept;
+		virtual bool game_data_ready_handler() const noexcept;
+	protected:
+		virtual bool run() const;
+	};
+}

source/xc_fix_greymovies.cpp

@@ -53,7 +53,7 @@ namespace xc
 		}
 		else
 		{
-			_ERROR("The patch \"%s\" has not been installed, as the mod does not know the game", get_name());
+			_ERROR("The fix \"%s\" has not been installed, as the mod does not know the game", get_name());
 			return false;
 		}
 

source/xc_fix_packageallocatelocation.cpp

@@ -0,0 +1,44 @@
+// Copyright © 2024 aka perchik71. All rights reserved.
+// Contacts: <email:timencevaleksej@gmail.com>
+// License: https://www.gnu.org/licenses/gpl-3.0.html
+
+#include <xc_fix_packageallocatelocation.h>
+#include <xc_version.h>
+#include <xc_plugin.h>
+
+namespace xc
+{
+	uintptr_t pointer_package_allocate_location_sub = 0;
+
+	void* fix_package_allocate_location::sub(void* self)
+	{
+		return self ? fastCall<void*>(pointer_package_allocate_location_sub, self) : nullptr;
+	}
+
+	const char* fix_package_allocate_location::get_name() const noexcept
+	{
+		return "package_allocate_location";
+	}
+
+	bool fix_package_allocate_location::game_data_ready_handler() const noexcept
+	{
+		return true;
+	}
+
+	bool fix_package_allocate_location::run() const
+	{
+		// only NG
+		if (g_plugin->get_runtime_version() == RUNTIME_VERSION_1_10_984)
+		{
+			pointer_package_allocate_location_sub = g_plugin->get_base() + 0x2352E0;
+			detour_call(g_plugin->get_base() + 0x711CE4, (uintptr_t)&sub);
+		}
+		else
+		{
+			_ERROR("The fix \"%s\" has not been installed, as the mod does not know the game", get_name());
+			return false;
+		}
+
+		return true;
+	}
+}

source/xc_patch_libdeflate.cpp

@@ -42,6 +42,11 @@ namespace xc
 			detour_call((g_plugin->get_base() + 0x2A5352), (uintptr_t)&impl_inflate_init);
 			detour_call((g_plugin->get_base() + 0x2A5384), (uintptr_t)&impl_inflate);
 		}
+		else
+		{
+			_ERROR("The patch \"%s\" has not been installed, as the mod does not know the game", get_name());
+			return false;
+		}
 
 		return true;
 	}

source/xc_patch_loadscreen.cpp

@@ -31,7 +31,7 @@ namespace xc
 			patch_mem((g_plugin->get_base() + 0xFE23C0), { 0xC3, 0x90 });	// Removing an item from the load logo, any
 		else
 		{
-			_ERROR("The patch has not been installed, as the mod does not know the game");
+			_ERROR("The patch \"%s\" has not been installed, as the mod does not know the game", get_name());
 			return false;
 		}
 

source/xc_patch_memory.cpp

@@ -253,6 +253,12 @@ namespace xc
 
 	bool patch_memory::run() const
 	{
+		if (GetModuleHandleA("BakaScrapHeap.dll"))
+		{
+			_WARNING("Mod \"Baka ScrapHeap\" has been detected, X-Cell patch \"%s\" is incompatible and will not be enabled.", get_name());
+			return false;
+		}
+
 		auto base = GetModuleHandleA(NULL);
 
 		MEMORYSTATUSEX statex = { 0 };

source/xc_patch_profile.cpp

@@ -30,6 +30,12 @@ namespace xc
 
 	bool patch_profile::run() const
 	{
+		if (GetModuleHandleA("PrivateProfileRedirector.dll"))
+		{
+			_WARNING("Mod \"PrivateProfileRedirector F4\" has been detected, disabling redundant patch \"%s\"", get_name());
+			return false;
+		}
+
 		auto base = GetModuleHandleA(NULL);
 
 		//

source/xc_plugin.cpp

@@ -17,6 +17,7 @@
 
 // fixes
 #include <xc_fix_greymovies.h>
+#include <xc_fix_packageallocatelocation.h>
 
 namespace xc
 {
@@ -161,6 +162,7 @@ namespace xc
 		//////////////////
 
 		_fixes.push_back(new fix_greymovies());
+		_fixes.push_back(new fix_package_allocate_location());
 
 		//////////////////