Misc stuff and code changes (#59)

* fix: revert original call for ThrowFatalError * fix: fix Player::Player(CNetGamePlayer *) * feat: test commit * feat(protections): add some more * feat: commit for merge * Merge * getting ready to merge * Merge fixes * feat(spoofing): hide godmode * feat(invoker): add varargs support * refactor(ContextMenu): cleanup * fix code * fix: remove duplicate invis entry * fix: use upstream classes * fix(spectate): by @DayibBaba --------- Co-authored-by: DayibBaba <[email protected]>
YimMenu · Nov 16, 2023 · 61dd656 · 61dd656
1 parent d5a9136
commit 61dd656
Show file tree

Hide file tree

Showing 71 changed files with 949 additions and 607 deletions.
diff --git a/cmake/rdr-classes.cmake b/cmake/rdr-classes.cmake
@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     rdr_classes
     GIT_REPOSITORY https://github.com/YimMenu/RDR-Classes.git
-    GIT_TAG        0132075d1c6a88066ce6f6225f168a49e76a51a3
+    GIT_TAG        1d566f23329b756aa3ef57be7b53525d949af14a
     GIT_PROGRESS TRUE
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""

diff --git a/src/common.hpp b/src/common.hpp
@@ -32,6 +32,7 @@ using namespace al;
 namespace YimMenu
 {
 	using namespace std::chrono_literals;
+	using namespace std::string_literals;
 
 	extern std::atomic<bool> g_Running;
 	extern HINSTANCE g_DllInstance;

diff --git a/src/core/commands/BoolCommand.cpp b/src/core/commands/BoolCommand.cpp
@@ -43,16 +43,6 @@ namespace YimMenu
 		MarkDirty();
 	}
 
-	void BoolCommand::SetDisabled(bool state)
-	{
-		m_Disabled = state;
-	}
-
-	bool BoolCommand::GetDisabled()
-	{
-		return m_Disabled;
-	}
-
 	void BoolCommand::Shutdown()
 	{
 		OnDisable();

diff --git a/src/core/commands/BoolCommand.hpp b/src/core/commands/BoolCommand.hpp
@@ -13,15 +13,11 @@ namespace YimMenu
 		virtual void LoadState(nlohmann::json& value) override;
 
 		bool m_State = false;
-		bool m_Disabled = false;
 	public:
 		BoolCommand(std::string name, std::string label, std::string description);
 		bool GetState();
 		void SetState(bool state);
 
-		bool GetDisabled();
-		void SetDisabled(bool state);
-
 		void Shutdown();
 	};
 }
diff --git a/src/core/commands/HotkeySystem.cpp b/src/core/commands/HotkeySystem.cpp
@@ -106,15 +106,14 @@ namespace YimMenu
 				}
 			}
 
-			if (AllKeysPressed && GetForegroundWindow() == Pointers.Hwnd)
+			if (AllKeysPressed && GetForegroundWindow() == Pointers.Hwnd && std::chrono::system_clock::now() - m_LastHotkeyTriggerTime > 100ms)
 			{
 				auto Command = Commands::GetCommand(Hash);
 				if (Command)
 				{
 					Command->Call();
 				}
-
-				ScriptMgr::Yield(100ms);
+				m_LastHotkeyTriggerTime = std::chrono::system_clock::now();
 			}
 		}
 	}

diff --git a/src/core/commands/HotkeySystem.hpp b/src/core/commands/HotkeySystem.hpp
@@ -15,6 +15,8 @@ namespace YimMenu
 	class HotkeySystem : 
 		private IStateSerializer
 	{
+		std::chrono::system_clock::time_point m_LastHotkeyTriggerTime;
+
 	public:
 		HotkeySystem();
 

diff --git a/src/core/commands/LoopedCommand.cpp b/src/core/commands/LoopedCommand.cpp
@@ -11,15 +11,6 @@ namespace YimMenu
 
 	void LoopedCommand::Tick()
 	{
-		if (LoopedCommand::GetState())
-		{
-			LoopedCommand::SetDisabled(false);
-			OnTick();
-		}
-		else if (!LoopedCommand::GetDisabled())
-		{
-			LoopedCommand::SetDisabled(true);
-			OnDisable();
-		}
+		OnTick();
 	}
 }
diff --git a/src/core/frontend/Notifications.cpp b/src/core/frontend/Notifications.cpp
@@ -38,11 +38,15 @@ namespace YimMenu
 	bool Notifications::EraseImpl(Notification notification)
 	{
 		for (auto& [id, n] : m_Notifications)
+		{
 			if (id == notification.GetIdentifier())
 			{
 				n.erasing = true;
 				return true;
 			}
+		}
+
+		return false;
 	}
 
 	static void DrawNotification(Notification& notification, int position)

diff --git a/src/core/hooking/Hooking.cpp b/src/core/hooking/Hooking.cpp
@@ -9,7 +9,6 @@
 
 namespace YimMenu
 {
-
 	Hooking::Hooking()
 	{
 		BaseHook::Add<Hooks::Window::WndProc>(new DetourHook("WndProc", Pointers.WndProc, Hooks::Window::WndProc));
@@ -51,6 +50,8 @@ namespace YimMenu
 
 		BaseHook::Add<Hooks::Info::NetworkRequest>(new DetourHook("NetworkReqeust", Pointers.NetworkRequest, Hooks::Info::NetworkRequest));
 		BaseHook::Add<Hooks::Info::AssignPhysicalIndex>(new DetourHook("AssignPhysicalIndex", Pointers.AssignPhysicalIndex, Hooks::Info::AssignPhysicalIndex));
+
+		BaseHook::Add<Hooks::Spoofing::WritePlayerHealthData>(new DetourHook("WritePlayerHealthData", Pointers.WritePlayerHealthData, Hooks::Spoofing::WritePlayerHealthData));
 	}
 
 	Hooking::~Hooking()

diff --git a/src/game/backend/Players.hpp b/src/game/backend/Players.hpp
@@ -5,7 +5,7 @@ namespace YimMenu
 {
 	class Players
 	{
-		std::map<uint8_t, Player> m_Players{};
+		std::unordered_map<uint8_t, Player> m_Players{};
 		Player m_SelectedPlayer = Player((uint8_t)0);
 
 	public:
@@ -24,7 +24,7 @@ namespace YimMenu
 			GetInstance().m_SelectedPlayer = Player(idx);
 		}
 
-		static std::map<uint8_t, Player>& GetPlayers()
+		static std::unordered_map<uint8_t, Player>& GetPlayers()
 		{
 			return GetInstance().m_Players;
 		}

diff --git a/src/game/bigfeatures/ContextMenu.cpp b/src/game/bigfeatures/ContextMenu.cpp