Merge remote-tracking branch 'origin/deepsource-transform-18fb2fbc'

kran27 · Dec 10, 2024 · cfb1d39 · cfb1d39
2 parents 2edbece + dd0ba22
commit cfb1d39
Show file tree

Hide file tree

Showing 20 changed files with 12,745 additions and 12,590 deletions.
diff --git a/VBExtender/byte_arrays.h b/VBExtender/byte_arrays.h
diff --git a/VBExtender/defs.h b/VBExtender/defs.h
diff --git a/VBExtender/functions.h b/VBExtender/functions.h
diff --git a/VBExtender/globals.h b/VBExtender/globals.h
@@ -6,7 +6,7 @@ constexpr auto version = "v0.1";
 static bool useNames = false;
 
 static int selEntity = 0;
-const char* entities[64] = {""};
+const char *entities[64] = {""};
 
 float entPos[3];
 

diff --git a/VBExtender/hooks.h b/VBExtender/hooks.h
@@ -1,48 +1,61 @@
 #pragma once
 #include <iostream>
 
-#include "speed.h"
 #include "detours.h"
 #include "functions.h"
 #include "globals.h"
 #include "imguiextensions.h"
+#include "speed.h"
 
-typedef void (WINAPI* OutputDebugStringAFunc)(LPCSTR lpOutputString);
+typedef void(WINAPI *OutputDebugStringAFunc)(LPCSTR lpOutputString);
 OutputDebugStringAFunc OriginalOutputDebugStringA;
 
 bool initReady = false;
 
-inline void WINAPI HookedOutputDebugStringA(const LPCSTR lpOutputString)
-{
-	//Only initialize after Client is connected (probably should do this smarter than checking debug strings.)
-	if (!initReady && strcmp(lpOutputString, "DIALOGUEINTERFACE INSTANTIATED\n - This debug line is to double check that it's not being created more than once.") == 0) initReady = true;
-
-	logs.AddLog(lpOutputString);
+inline void WINAPI HookedOutputDebugStringA(const LPCSTR lpOutputString) {
+  // Only initialize after Client is connected (probably should do this smarter
+  // than checking debug strings.)
+  if (!initReady &&
+      strcmp(lpOutputString,
+             "DIALOGUEINTERFACE INSTANTIATED\n - This debug line is to double "
+             "check that it's not being created more than once.") == 0)
+    initReady = true;
+
+  logs.AddLog(lpOutputString);
 
-	OriginalOutputDebugStringA(lpOutputString);
+  OriginalOutputDebugStringA(lpOutputString);
 }
 
-void InitHooks()
-{
-	HMODULE kernel32 = GetModuleHandleA("kernel32.dll");
-	HMODULE winmm = GetModuleHandleA("winmm.dll");
-
-	OriginalOutputDebugStringA = reinterpret_cast<OutputDebugStringAFunc>(GetProcAddress(kernel32, "OutputDebugStringA"));
-	g_GetTickCountOriginal = (GetTickCountType)GetProcAddress(kernel32, "GetTickCount");
-	g_TimeGetTimeOriginal = (GetTickCountType)GetProcAddress(winmm, "timeGetTime");
-	g_QueryPerformanceCounterOriginal = (QueryPerformanceCounterType)GetProcAddress(kernel32, "QueryPerformanceCounter");
-
-	// Setup the speed hack object for the Performance Counter
-	LARGE_INTEGER performanceCounter;
-	g_QueryPerformanceCounterOriginal(&performanceCounter);
-
-	g_speedHackLL = SpeedHack<LONGLONG>(performanceCounter.QuadPart, kInitialSpeed);
-
-	DetourTransactionBegin();
-	DetourUpdateThread(GetCurrentThread());
-	DetourAttach(reinterpret_cast<PVOID*>(&OriginalOutputDebugStringA), HookedOutputDebugStringA);
-	DetourAttach(reinterpret_cast<PVOID*>(&g_GetTickCountOriginal), GetTickCountHacked);
-	DetourAttach(reinterpret_cast<PVOID*>(&g_TimeGetTimeOriginal), GetTickCountHacked);
-	DetourAttach(reinterpret_cast<PVOID*>(&g_QueryPerformanceCounterOriginal), QueryPerformanceCounterHacked);
-	DetourTransactionCommit();
+void InitHooks() {
+  HMODULE kernel32 = GetModuleHandleA("kernel32.dll");
+  HMODULE winmm = GetModuleHandleA("winmm.dll");
+
+  OriginalOutputDebugStringA = reinterpret_cast<OutputDebugStringAFunc>(
+      GetProcAddress(kernel32, "OutputDebugStringA"));
+  g_GetTickCountOriginal =
+      (GetTickCountType)GetProcAddress(kernel32, "GetTickCount");
+  g_TimeGetTimeOriginal =
+      (GetTickCountType)GetProcAddress(winmm, "timeGetTime");
+  g_QueryPerformanceCounterOriginal =
+      (QueryPerformanceCounterType)GetProcAddress(kernel32,
+                                                  "QueryPerformanceCounter");
+
+  // Setup the speed hack object for the Performance Counter
+  LARGE_INTEGER performanceCounter;
+  g_QueryPerformanceCounterOriginal(&performanceCounter);
+
+  g_speedHackLL =
+      SpeedHack<LONGLONG>(performanceCounter.QuadPart, kInitialSpeed);
+
+  DetourTransactionBegin();
+  DetourUpdateThread(GetCurrentThread());
+  DetourAttach(reinterpret_cast<PVOID *>(&OriginalOutputDebugStringA),
+               HookedOutputDebugStringA);
+  DetourAttach(reinterpret_cast<PVOID *>(&g_GetTickCountOriginal),
+               GetTickCountHacked);
+  DetourAttach(reinterpret_cast<PVOID *>(&g_TimeGetTimeOriginal),
+               GetTickCountHacked);
+  DetourAttach(reinterpret_cast<PVOID *>(&g_QueryPerformanceCounterOriginal),
+               QueryPerformanceCounterHacked);
+  DetourTransactionCommit();
 }