Avoid finding Tier0Dll twice

danielkrupinski · Oct 27, 2023 · 03e9c0a · 03e9c0a
1 parent 63e77a5
commit 03e9c0a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/Source/GameClasses/Implementation/FileNameSymbolTableImpl.h b/Source/GameClasses/Implementation/FileNameSymbolTableImpl.h
@@ -4,7 +4,12 @@
 #include <GameDLLs/Tier0Dll.h>
 
 struct FileNameSymbolTableImpl {
+    explicit FileNameSymbolTableImpl(Tier0Dll tier0Dll) noexcept
+        : string{ tier0Dll.filenameSymbolTableString() }
+    {
+    }
+
     [[nodiscard]] static const FileNameSymbolTableImpl& instance() noexcept;
 
-    cs2::CUtlFilenameSymbolTable::String* string{ Tier0Dll{}.filenameSymbolTableString() };
+    cs2::CUtlFilenameSymbolTable::String* string;
 };
diff --git a/Source/GameClasses/Implementation/GameClassImplementations.h b/Source/GameClasses/Implementation/GameClassImplementations.h
@@ -12,6 +12,12 @@
 #include "PlantedC4Impl.h"
 
 struct GameClassImplementations {
+    explicit GameClassImplementations(Tier0Dll tier0Dll) noexcept
+        : fileNameSymbolTable{ tier0Dll }
+        , memAlloc{ tier0Dll }
+    {
+    }
+
     ClientModeImpl clientMode;
     FileNameSymbolTableImpl fileNameSymbolTable;
     FileSystemImpl fileSystem;

diff --git a/Source/GameClasses/Implementation/MemAllocImpl.h b/Source/GameClasses/Implementation/MemAllocImpl.h
@@ -9,8 +9,13 @@
 #include <Utils/FieldOffset.h>
 
 struct MemAllocImpl {
+    explicit MemAllocImpl(Tier0Dll tier0Dll) noexcept
+        : thisptr{ tier0Dll.memAlloc() }
+    {
+    }
+
     [[nodiscard]] static const MemAllocImpl& instance() noexcept;
 
-    cs2::IMemAlloc** thisptr{ Tier0Dll{}.memAlloc() };
+    cs2::IMemAlloc** thisptr;
     FieldOffset<const void, cs2::IMemAlloc::Alloc*, std::int8_t> alloc{ MemAllocPatterns::allocOffset() };
 };
diff --git a/Source/GlobalContext.h b/Source/GlobalContext.h
@@ -54,7 +54,7 @@ struct GlobalContext {
         if (initializedFromGameThread)
             return;
 
-        gameClasses.init();
+        gameClasses.init(Tier0Dll{});
         const VmtLengthCalculator clientVmtLengthCalculator{ DynamicLibrary{cs2::CLIENT_DLL}.getCodeSection(), DynamicLibrary{cs2::CLIENT_DLL}.getVmtSection() };
         hooks.init(clientVmtLengthCalculator);
         features.init(HudProvider{}, hooks->loopModeGameHook, hooks->viewRenderHook);