Pointer Cache

src/core/commands/HotkeySystem.cpp

@@ -1,29 +1,30 @@
 #include "HotkeySystem.hpp"
 
-#include "game/rdr/Natives.hpp" // TODO: game import in core
-#include "game/backend/ScriptMgr.hpp"
 #include "Commands.hpp"
 #include "LoopedCommand.hpp"
+#include "game/backend/ScriptMgr.hpp"
+#include "game/rdr/Natives.hpp" // TODO: game import in core
+
 
 // TODO: serialization isn't stable
 
 namespace YimMenu
 {
-	HotkeySystem::HotkeySystem() : 
-		IStateSerializer("hotkeys")
+	HotkeySystem::HotkeySystem() :
+	    IStateSerializer("hotkeys")
 	{
 	}
 
 	void HotkeySystem::RegisterCommands()
 	{
-		auto Commands        = Commands::GetCommands();
-		
+		auto Commands = Commands::GetCommands();
+
 		for (auto [Hash, Command] : Commands)
 		{
 			CommandLink link;
 			m_CommandHotkeys.insert(std::make_pair(Command->GetHash(), link));
 		}
-		
+
 		LOG(INFO) << "Registered " << m_CommandHotkeys.size() << " commands";
 	}
 
@@ -95,17 +96,17 @@ namespace YimMenu
 		{
 			if (Link.Hotkey.empty() || Link.Listening)
 				continue;
-	
+
 			bool AllKeysPressed = true;
-	
+
 			for (auto HotkeyModifier : Link.Hotkey)
 			{
 				if (!(GetAsyncKeyState(HotkeyModifier) & 0x8000))
 				{
 					AllKeysPressed = false;
 				}
 			}
-	
+
 			if (AllKeysPressed && GetForegroundWindow() == Pointers.Hwnd && std::chrono::system_clock::now() - m_LastHotkeyTriggerTime > 100ms)
 			{
 				auto Command = Commands::GetCommand(Hash);
@@ -134,7 +135,7 @@ namespace YimMenu
 		for (auto& [key, value] : state.items())
 		{
 			if (m_CommandHotkeys.contains(std::atoi(key.data())))
-				m_CommandHotkeys[std::atoi(key.data())].Hotkey = value.get<std::vector<int>>(); 
+				m_CommandHotkeys[std::atoi(key.data())].Hotkey = value.get<std::vector<int>>();
 		}
 	}
 }

src/core/memory/PatternScanner.cpp

@@ -1,9 +1,12 @@
 #include "PatternScanner.hpp"
 
 #include "Module.hpp"
+#include "game/pointers/Pointers.hpp"
 
+#include <functional>
 #include <future>
 
+
 namespace YimMenu
 {
 	PatternScanner::PatternScanner(const Module* module) :
@@ -17,13 +20,31 @@ namespace YimMenu
 		if (!m_Module || !m_Module->Valid())
 			return false;
 
+
+		Pointers.Cache.Load();
+		bool scanSuccess = true;
 		std::vector<std::future<bool>> jobs;
+		bool forceUpdate = false;
+		if (Pointers.Cache.IsCacheOutdated())
+		{
+			forceUpdate = true;
+			Pointers.Cache.IncrementCacheVersion();
+		}
+
 		for (const auto& [pattern, func] : m_Patterns)
 		{
-			jobs.emplace_back(std::async(&PatternScanner::ScanInternal, this, pattern, func));
+			uintptr_t cachedPointer = Pointers.Cache.GetData(pattern->Name().data());
+			if (cachedPointer != 0 && !forceUpdate)
+			{
+				std::invoke(func, cachedPointer);
+			}
+			else
+			{
+				jobs.emplace_back(std::async(&PatternScanner::ScanInternal, this, pattern, func));
+			}
 		}
 
-		bool scanSuccess = true;
+
 		for (auto& job : jobs)
 		{
 			job.wait();
@@ -35,6 +56,7 @@ namespace YimMenu
 		{
 			LOG(FATAL) << "Some patterns have not been found, continuing would be foolish.";
 		}
+
 		return scanSuccess;
 	}
 
@@ -63,6 +85,8 @@ namespace YimMenu
 
 				std::invoke(func, i);
 
+				Pointers.Cache.GetOrUpdate(pattern->Name().data(), i);
+
 				return true;
 			}
 		}

src/core/memory/PatternScanner.hpp

@@ -1,10 +1,12 @@
 #pragma once
 #include "Pattern.hpp"
 #include "PointerCalculator.hpp"
+#include "game/pointers/PointerCache.hpp"
 
 #include <functional>
 #include <vector>
 
+
 namespace YimMenu
 {
 	class Module;
@@ -16,6 +18,7 @@ namespace YimMenu
 		const Module* m_Module;
 		std::vector<std::pair<const IPattern*, PatternFunc>> m_Patterns;
 
+
 	public:
 		PatternScanner(const Module* module);