R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Light cleanup

Browse Source
This commit is contained in:
Amos 2021-06-19 11:22:45 -07:00
parent 869e60af66
commit 48766c23d9
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/src/console.cpp
View File

@ -12,7 +12,7 @@
///////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------------
// Init
// Initialization
//---------------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////////
@ -44,7 +44,7 @@ void SetupConsole()
///////////////////////////////////////////////////////////////////////////////
// Open input/output streams
FILE* fDummy;
freopen_s(&fDummy, "CONIN$", "r", stdin);
freopen_s(&fDummy, "CONIN$", "r", stdin);
freopen_s(&fDummy, "CONOUT$", "w", stdout);
freopen_s(&fDummy, "CONOUT$", "w", stderr);

2
r5dev/src/hooks.cpp
View File

@ -13,7 +13,7 @@
///////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------------
// Netchan
// Netchannel
//---------------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////////

14
r5dev/src/id3dx.cpp
View File

@ -63,8 +63,6 @@ LRESULT CALLBACK DXGIMsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
LRESULT CALLBACK hWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
ImGuiIO& io = ImGui::GetIO();
if (uMsg == WM_KEYDOWN)
{
if (wParam == VK_OEM_3)
@ -84,14 +82,20 @@ LRESULT CALLBACK hWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
return 1L;
case WM_LBUTTONUP:
return 1L;
case WM_LBUTTONDBLCLK:
return 1L;
case WM_RBUTTONDOWN:
return 1L;
case WM_RBUTTONUP:
return 1L;
case WM_RBUTTONDBLCLK:
return 1L;
case WM_MBUTTONDOWN:
return 1L;
case WM_MBUTTONUP:
return 1L;
case WM_MBUTTONDBLCLK:
return 1L;
case WM_KEYDOWN:
return 1L;
case WM_KEYUP:
@ -243,7 +247,7 @@ void GetPresent()
///////////////////////////////////////////////////////////////////////////////////
//---------------------------------------------------------------------------------
// Init
// Initialization
//---------------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////////
@ -412,11 +416,11 @@ void RemoveDXHooks()
// Begin the detour transaction
DetourTransactionBegin();
DetourUpdateThread(GetCurrentThread());
//////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Unhook PostMessage
DetourAttach(&(LPVOID&)g_oPostMessageA, (PBYTE)HPostMessageA);
DetourAttach(&(LPVOID&)g_oPostMessageW, (PBYTE)HPostMessageW);
//////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// Unhook SwapChain
DetourDetach(&(LPVOID&)g_fnIDXGISwapChainPresent, (PBYTE)Present);
DetourDetach(&(LPVOID&)g_oResizeBuffers, (PBYTE)GetResizeBuffers);

4
r5dev/src/input.cpp
View File

@ -27,7 +27,7 @@ extern BOOL g_bBlockInput = false;
///////////////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
// Init
// Initialization
//-----------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////
@ -41,7 +41,7 @@ void SetupIPHooks()
///////////////////////////////////////////////////////////////////////////////
//-----------------------------------------------------------------------------
// Input
// Hooks
//-----------------------------------------------------------------------------
///////////////////////////////////////////////////////////////////////////////

9
r5dev/src/overlay.cpp
View File

@ -56,7 +56,7 @@ public:
}
///////////////////////////////////////////////////////////////////////////
// Helpers
// Internals
static int Stricmp(const char* s1, const char* s2)
{
int d;
@ -96,7 +96,6 @@ public:
void AddLog(const char* fmt, ...) IM_FMTARGS(2)
{
// FIXME-OPT
char buf[1024];
va_list args;
va_start(args, fmt);
@ -241,14 +240,10 @@ public:
colors[ImGuiCol_Text] = ImVec4(1.00f, 1.00f, 1.00f, 0.60f);
colors[ImGuiCol_TextDisabled] = ImVec4(1.00f, 1.00f, 1.00f, 0.40f);
colors[ImGuiCol_WindowBg] = ImVec4(0.06f, 0.06f, 0.06f, 1.00f);
//colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.86f);
colors[ImGuiCol_ChildBg] = ImVec4(0.00f, 0.00f, 0.00f, 1.00f);
colors[ImGuiCol_PopupBg] = ImVec4(0.08f, 0.08f, 0.08f, 1.00f);
//colors[ImGuiCol_Border] = ImVec4(0.00f, 0.00f, 0.00f, 0.40f);
colors[ImGuiCol_Border] = ImVec4(0.14f, 0.14f, 0.14f, 1.00f);
//colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.00f);
colors[ImGuiCol_BorderShadow] = ImVec4(0.00f, 0.00f, 0.00f, 0.70f);
//colors[ImGuiCol_FrameBg] = ImVec4(0.02f, 0.02f, 0.02f, 1.00f);
colors[ImGuiCol_FrameBg] = ImVec4(0.00f, 0.00f, 0.00f, 0.75f);
colors[ImGuiCol_FrameBgHovered] = ImVec4(0.11f, 0.11f, 0.11f, 1.00f);
colors[ImGuiCol_FrameBgActive] = ImVec4(0.21f, 0.21f, 0.21f, 1.00f);
@ -263,7 +258,6 @@ public:
colors[ImGuiCol_CheckMark] = ImVec4(1.00f, 1.00f, 1.00f, 0.59f);
colors[ImGuiCol_SliderGrab] = ImVec4(0.24f, 0.52f, 0.88f, 1.00f);
colors[ImGuiCol_SliderGrabActive] = ImVec4(0.26f, 0.59f, 0.98f, 1.00f);
//colors[ImGuiCol_Button] = ImVec4(0.12f, 0.12f, 0.12f, 1.00f);
colors[ImGuiCol_Button] = ImVec4(0.10f, 0.10f, 0.10f, 1.00f);
colors[ImGuiCol_ButtonHovered] = ImVec4(0.18f, 0.18f, 0.18f, 1.00f);
colors[ImGuiCol_ButtonActive] = ImVec4(0.20f, 0.20f, 0.20f, 1.00f);
@ -299,7 +293,6 @@ public:
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 0.5f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
ImGui::PushStyleVar(ImGuiStyleVar_ScrollbarRounding, 1.0f);
//ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 2.0f);
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 2.5f);
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 1)); // Tighten spacing
}