From 9c343f2fd2b9ce7fbd4ed55df986065e848e7dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Krupi=C5=84ski?= <danielkrupinski@outlook.com>
Date: Tue, 17 Oct 2023 21:57:47 +0200
Subject: [PATCH] Add Hooks struct

---
 Source/Endpoints.h            | 12 ++++++------
 Source/GlobalContext.h        | 10 +++++-----
 Source/Hooks/Hooks.h          | 17 +++++++++++++++++
 Source/Osiris.vcxproj         |  1 +
 Source/Osiris.vcxproj.filters |  3 +++
 5 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 Source/Hooks/Hooks.h

diff --git a/Source/Endpoints.h b/Source/Endpoints.h
index 63d57e0c1ea..4172916728e 100644
--- a/Source/Endpoints.h
+++ b/Source/Endpoints.h
@@ -30,15 +30,15 @@ inline int PeepEventsHook::SDL_PeepEvents(void* events, int numevents,
     hudFeatures().killfeedPreserver.run();
 
     GlobalContext::instance().panoramaGUI->run();
-    GlobalContext::instance().loopModeGameHook->update();
-    GlobalContext::instance().viewRenderHook->update();
+    GlobalContext::instance().hooks->loopModeGameHook.update();
+    GlobalContext::instance().hooks->viewRenderHook.update();
     visuals().scopeOverlayRemover.updatePanelVisibility();
 
     if (GlobalContext::instance().unloadFlag) {
         const auto originalPeepEvents = GlobalContext::instance().peepEventsHook.original;
         GlobalContext::instance().peepEventsHook.disable();
-        GlobalContext::instance().loopModeGameHook->forceUninstall();
-        GlobalContext::instance().viewRenderHook->forceUninstall();
+        GlobalContext::instance().hooks->loopModeGameHook.forceUninstall();
+        GlobalContext::instance().hooks->viewRenderHook.forceUninstall();
         GlobalContext::destroyInstance();
         return originalPeepEvents(events, numevents, action, minType, maxType);
     }
@@ -48,10 +48,10 @@ inline int PeepEventsHook::SDL_PeepEvents(void* events, int numevents,
 inline void* LoopModeGameHook::getWorldSession(cs2::CLoopModeGame* thisptr) noexcept
 {
     visuals().scopeOverlayRemover.getWorldSessionHook(RETURN_ADDRESS());
-    return GlobalContext::instance().loopModeGameHook->originalGetWorldSession(thisptr);
+    return GlobalContext::instance().hooks->loopModeGameHook.originalGetWorldSession(thisptr);
 }
 
 inline void ViewRenderHook::onRenderStart(cs2::CViewRender* thisptr) noexcept
 {
-    GlobalContext::instance().viewRenderHook->originalOnRenderStart(thisptr);
+    GlobalContext::instance().hooks->viewRenderHook.originalOnRenderStart(thisptr);
 }
diff --git a/Source/GlobalContext.h b/Source/GlobalContext.h
index f4574087768..66483f4f2b3 100644
--- a/Source/GlobalContext.h
+++ b/Source/GlobalContext.h
@@ -3,6 +3,7 @@
 #include <optional>
 
 #include "CS2/Constants/DllNames.h"
+#include "Hooks/Hooks.h"
 #include "Hooks/PeepEventsHook.h"
 #include "Hooks/ViewRenderHook.h"
 
@@ -23,8 +24,7 @@ struct GlobalContext {
     PatternFinder<PatternNotFoundLogger> clientPatternFinder{ DynamicLibrary{cs2::CLIENT_DLL}.getCodeSection().raw(), PatternNotFoundLogger{} };
     PatternFinder<PatternNotFoundLogger> panoramaPatternFinder{ DynamicLibrary{cs2::PANORAMA_DLL}.getCodeSection().raw(), PatternNotFoundLogger{} };
     std::optional<GameClassImplementations> gameClasses;
-    std::optional<LoopModeGameHook> loopModeGameHook;
-    std::optional<ViewRenderHook> viewRenderHook;
+    std::optional<Hooks> hooks;
     std::optional<Features> features;
     std::optional<PanoramaGUI> panoramaGUI;
 
@@ -52,9 +52,9 @@ struct GlobalContext {
             return;
 
         gameClasses.emplace();
-        loopModeGameHook.emplace(VmtLengthCalculator{ DynamicLibrary{cs2::CLIENT_DLL}.getCodeSection(), DynamicLibrary{cs2::CLIENT_DLL}.getVmtSection() });
-        viewRenderHook.emplace(VmtLengthCalculator{ DynamicLibrary{cs2::CLIENT_DLL}.getCodeSection(), DynamicLibrary{cs2::CLIENT_DLL}.getVmtSection() });
-        features.emplace(HudProvider{}, *loopModeGameHook);
+        const VmtLengthCalculator clientVmtLengthCalculator{ DynamicLibrary{cs2::CLIENT_DLL}.getCodeSection(), DynamicLibrary{cs2::CLIENT_DLL}.getVmtSection() };
+        hooks.emplace(clientVmtLengthCalculator);
+        features.emplace(HudProvider{}, hooks->loopModeGameHook, hooks->viewRenderHook);
         panoramaGUI.emplace(*features, unloadFlag);
 
         initializedFromGameThread = true;
diff --git a/Source/Hooks/Hooks.h b/Source/Hooks/Hooks.h
new file mode 100644
index 00000000000..8b201cfbcb6
--- /dev/null
+++ b/Source/Hooks/Hooks.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "LoopModeGameHook.h"
+#include "ViewRenderHook.h"
+
+#include <Vmt/VmtLengthCalculator.h>
+
+struct Hooks {
+    explicit Hooks(const VmtLengthCalculator& clientVmtLengthCalculator) noexcept
+        : loopModeGameHook{ clientVmtLengthCalculator }
+        , viewRenderHook{ clientVmtLengthCalculator }
+    {
+    }
+
+    LoopModeGameHook loopModeGameHook;
+    ViewRenderHook viewRenderHook;
+};
diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
index a954abc9f56..cc4f153781b 100644
--- a/Source/Osiris.vcxproj
+++ b/Source/Osiris.vcxproj
@@ -68,6 +68,7 @@
     <ClInclude Include="Helpers\PatternNotFoundLogger.h" />
     <ClInclude Include="Helpers\PlantedC4Provider.h" />
     <ClInclude Include="Helpers\UnloadFlag.h" />
+    <ClInclude Include="Hooks\Hooks.h" />
     <ClInclude Include="Hooks\LoopModeGameHook.h" />
     <ClInclude Include="Hooks\PeepEventsHook.h" />
     <ClInclude Include="Hooks\ViewRenderHook.h" />
diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
index c276ab9a60e..c96e19c8364 100644
--- a/Source/Osiris.vcxproj.filters
+++ b/Source/Osiris.vcxproj.filters
@@ -531,6 +531,9 @@
     <ClInclude Include="Hooks\ViewRenderHook.h">
       <Filter>Hooks</Filter>
     </ClInclude>
+    <ClInclude Include="Hooks\Hooks.h">
+      <Filter>Hooks</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">