From 8f7a3ef3368b08e54ad86d70210a051c185d4b59 Mon Sep 17 00:00:00 2001 From: Amos <48657826+Mauler125@users.noreply.github.com> Date: Wed, 16 Mar 2022 02:03:06 +0100 Subject: [PATCH] Small improvements --- r5dev/windows/console.cpp | 3 ++- r5dev/windows/id3dx.cpp | 12 ++++++------ r5dev/windows/system.cpp | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/r5dev/windows/console.cpp b/r5dev/windows/console.cpp index 9492ee1c..a43e46f6 100644 --- a/r5dev/windows/console.cpp +++ b/r5dev/windows/console.cpp @@ -117,7 +117,8 @@ void Console_Init() if (!SetConsoleMode(hOutput, dwMode)) // Some editions of Windows have 'VirtualTerminalLevel' disabled by default. { // Warn the user if 'VirtualTerminalLevel' could not be set on users environment. - MessageBoxA(NULL, "Failed to set console mode 'VirtualTerminalLevel'.\nPlease omit the '-ansiclr' parameter and restart \nthe game if output logging appears distorted.", "SDK Warning", MB_ICONEXCLAMATION | MB_OK); + MessageBoxA(NULL, "Failed to set console mode 'VirtualTerminalLevel'.\n" + "Please omit the '-ansiclr' parameter and restart \nthe game if output logging appears distorted.", "SDK Warning", MB_ICONEXCLAMATION | MB_OK); } SetConsoleBackgroundColor(0x0000); AnsiColors_Init(); diff --git a/r5dev/windows/id3dx.cpp b/r5dev/windows/id3dx.cpp index 5ab78f70..024ff5d9 100644 --- a/r5dev/windows/id3dx.cpp +++ b/r5dev/windows/id3dx.cpp @@ -212,9 +212,9 @@ void GetPresent() { if (mat_showdxoutput->GetBool()) { - DevMsg(eDLL_T::MS, "+--------------------------------------------------------+\n"); - DevMsg(eDLL_T::MS, "| >>>>>>>>>| VIRTUAL METHOD TABLE HOOK FAILED |<<<<<<<<< |\n"); - DevMsg(eDLL_T::MS, "+--------------------------------------------------------+\n"); + Error(eDLL_T::MS, "+--------------------------------------------------------+\n"); + Error(eDLL_T::MS, "| >>>>>>>>>| VIRTUAL METHOD TABLE HOOK FAILED |<<<<<<<<< |\n"); + Error(eDLL_T::MS, "+--------------------------------------------------------+\n"); } DirectX_Shutdown(); return; @@ -390,9 +390,9 @@ HRESULT __stdcall Present(IDXGISwapChain* pSwapChain, UINT nSyncInterval, UINT n { if (mat_showdxoutput->GetBool()) { - DevMsg(eDLL_T::MS, "+--------------------------------------------------------+\n"); - DevMsg(eDLL_T::MS, "| >>>>>>>>>>| GET DVS AND CTX FROM SCP FAILED |<<<<<<<<< |\n"); - DevMsg(eDLL_T::MS, "+--------------------------------------------------------+\n"); + Error(eDLL_T::MS, "+--------------------------------------------------------+\n"); + Error(eDLL_T::MS, "| >>>>>>>>>>| GET DVS AND CTX FROM SCP FAILED |<<<<<<<<< |\n"); + Error(eDLL_T::MS, "+--------------------------------------------------------+\n"); } return g_fnIDXGISwapChainPresent(pSwapChain, nSyncInterval, nFlags); } diff --git a/r5dev/windows/system.cpp b/r5dev/windows/system.cpp index b531a30e..aacb907b 100644 --- a/r5dev/windows/system.cpp +++ b/r5dev/windows/system.cpp @@ -12,7 +12,7 @@ static IGetVersionExA g_oGetVersionExA = null BOOL WINAPI HGetVersionExA(_Inout_ LPOSVERSIONINFOA lpVersionInformation) { #ifdef DEDICATED - // Return false for dedicated to skip 'SetPRocessDpiAwareness' in 'CEngineAPI:OnStartup()'. + // Return false for dedicated to skip 'SetProcessDpiAwareness' in 'CEngineAPI:OnStartup()'. return NULL; #else return g_oGetVersionExA(lpVersionInformation);