refactor: clean up

shad0wshayd3-FO4 · Nov 16, 2024 · f8debb9 · f8debb9
1 parent c8ae644
commit f8debb9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 22 deletions.
diff --git a/extern/commonlibf4 b/extern/commonlibf4
diff --git a/src/PCH.h b/src/PCH.h
@@ -2,8 +2,6 @@
 
 #include "F4SE/F4SE.h"
 #include "RE/Fallout.h"
-#include "REX/REX.h"
-
-#include <xbyak/xbyak.h>
+#include "REX/REX/INI.h"
 
 using namespace std::literals;
diff --git a/src/main.cpp b/src/main.cpp
@@ -2,7 +2,7 @@ namespace Config
 {
 	namespace General
 	{
-		static REX::INI::U32 iScrapHeapMult{ "General"sv, "iScrapHeapMult"sv, 2 };
+		static REX::INI::U32 iScrapHeapMult{ "General"sv, "iScrapHeapMult"sv, 2u };
 	}
 
 	static void Load()
@@ -14,13 +14,18 @@ namespace Config
 	}
 }
 
-class ScrapHeap
+namespace ScrapHeap
 {
-public:
+	static std::uint32_t MaxMemory{ 0x04000000u };
+	static std::uint32_t QMaxMemory()
+	{
+		return MaxMemory;
+	}
+
 	static void Install()
 	{
 		static REL::Relocation target{ REL::ID(2228361) };
-		target.write_func(0x10, QMaxMemory);
+		target.replace_func(0x10, QMaxMemory);
 
 		auto iScrapHeapMult = Config::General::iScrapHeapMult.GetValue();
 		switch (iScrapHeapMult)
@@ -30,30 +35,22 @@ class ScrapHeap
 			break;
 		case 2:
 			F4SE::log::info("ScrapHeap patched [0x08000000 (~130mb)]"sv);
-			MaxMemory = 0x08000000;
+			MaxMemory = 0x08000000u;
 			break;
 		case 3:
 			F4SE::log::info("ScrapHeap patched [0x0C000000 (~200mb)]"sv);
-			MaxMemory = 0x0C000000;
+			MaxMemory = 0x0C000000u;
 			break;
 		case 4:
 			F4SE::log::info("ScrapHeap patched [0x0FF00000 (~270mb)]"sv);
-			MaxMemory = 0x0FF00000;
+			MaxMemory = 0x0FF00000u;
 			break;
 		default:
 			F4SE::log::info("ScrapHeapMult invalid: value must be between 1 and 4, is {:d}."sv, iScrapHeapMult);
 			break;
 		}
 	}
-
-private:
-	static std::uint32_t QMaxMemory()
-	{
-		return MaxMemory;
-	}
-
-	inline static std::uint32_t MaxMemory{ 0x04000000 };
-};
+}
 
 namespace
 {
@@ -63,7 +60,6 @@ namespace
 		{
 		case F4SE::MessagingInterface::kPostLoad:
 		{
-			Config::Load();
 			ScrapHeap::Install();
 			break;
 		}
@@ -78,5 +74,7 @@ F4SEPluginLoad(const F4SE::LoadInterface* a_F4SE)
 	F4SE::Init(a_F4SE);
 	F4SE::GetMessagingInterface()->RegisterListener(MessageCallback);
 
+	Config::Load();
+
 	return true;
 }
diff --git a/xmake.lua b/xmake.lua
@@ -24,7 +24,6 @@ add_rules("mode.debug", "mode.releasedbg")
 add_rules("plugin.vsxmake.autoupdate")
 
 -- add options
-set_config("f4se_xbyak", true)
 set_config("rex_ini", true)
 
 -- setup targets