diff --git a/r5dev/console.cpp b/r5dev/console.cpp index 769ceee3..30c02dda 100644 --- a/r5dev/console.cpp +++ b/r5dev/console.cpp @@ -9,7 +9,7 @@ DWORD __stdcall ProcessConsoleWorker(LPVOID); FILE* sBuildTxt; -CHAR sBuildStr[1024]; +CHAR sBuildBuf[1024]; void SetupConsole() { @@ -25,10 +25,10 @@ void SetupConsole() sBuildTxt = fopen("build.txt", "r"); if (sBuildTxt) { - while (fgets(sBuildStr, sizeof(sBuildStr), sBuildTxt) != NULL) + while (fgets(sBuildBuf, sizeof(sBuildBuf), sBuildTxt) != NULL) fclose(sBuildTxt); } - SetConsoleTitle(sBuildStr); + SetConsoleTitle(sBuildBuf); // Open input/output streams FILE* fDummy; @@ -41,8 +41,6 @@ void SetupConsole() CloseHandle(hThread); } -bool Hook_Cvar_IsFlagSet(int ** cvar, int flag); - bool Hook_Cvar_IsFlagSet(int ** cvar, int flag) { int real_flags = *(*(cvar + (72/(sizeof(void*)))) + (56/sizeof(int))); diff --git a/r5dev/hooks.cpp b/r5dev/hooks.cpp index 3f2af60a..c785837c 100644 --- a/r5dev/hooks.cpp +++ b/r5dev/hooks.cpp @@ -8,11 +8,6 @@ #include "hooks.h" #include "patterns.h" -void* Hook_SQVM_Print(void* sqvm, char* fmt, ...); -bool Hook_SQVM_LoadScript(void* sqvm, const char* script_path, const char* script_name, int flag); -bool Hook_NET_ReceiveDatagram(int sock, void* inpacket, bool raw); -unsigned int Hook_NET_SendDatagram(SOCKET s, const char* ptxt, int len, void* netchan_maybe, bool raw); - // // Engine Hooks // diff --git a/r5launcher/main.cpp b/r5launcher/main.cpp index c6adf824..2b68d05a 100644 --- a/r5launcher/main.cpp +++ b/r5launcher/main.cpp @@ -21,7 +21,7 @@ void PrintLastError() bool LaunchR5Apex() { FILE* sLaunchParams; - CHAR sArgumentSize[1024]; + CHAR sArgumentBuffer[1024]; CHAR sCommandDirectory[MAX_PATH]; LPSTR sCommandLine = sCommandDirectory; @@ -43,7 +43,7 @@ bool LaunchR5Apex() // Load command line arguments from a file on the disk. if (sLaunchParams) { - while (fgets(sArgumentSize, sizeof(sArgumentSize), sLaunchParams) != NULL) + while (fgets(sArgumentBuffer, sizeof(sArgumentBuffer), sLaunchParams) != NULL) fclose(sLaunchParams); } @@ -51,7 +51,7 @@ bool LaunchR5Apex() GetCurrentDirectory(MAX_PATH, sGameDirectory); snprintf(sGameExe, sizeof(sGameExe), "%s\\r5apex.exe", sGameDirectory); snprintf(sDevDll, sizeof(sDevDll), "%s\\r5dev.dll", sGameDirectory); - snprintf(sCommandLine, sizeof(sCommandDirectory), "%s\\r5apex.exe %s", sGameDirectory, sArgumentSize); + snprintf(sCommandLine, sizeof(sCommandDirectory), "%s\\r5apex.exe %s", sGameDirectory, sArgumentBuffer); printf("Launching Apex Dev...\n"); printf(" - CWD: %s\n", sGameDirectory);