diff --git a/Dllmain/BuildNo.rc b/Dllmain/BuildNo.rc index 7cc138ee..890568b4 100644 --- a/Dllmain/BuildNo.rc +++ b/Dllmain/BuildNo.rc @@ -1 +1 @@ -#define BUILD_NUMBER 6959 +#define BUILD_NUMBER 6960 diff --git a/External/d3d8to9 b/External/d3d8to9 index 1bcbeca4..7df94afc 160000 --- a/External/d3d8to9 +++ b/External/d3d8to9 @@ -1 +1 @@ -Subproject commit 1bcbeca40beb9756d21872300a75174dd01cff7f +Subproject commit 7df94afcca74583b46287752191af400b92658b2 diff --git a/External/dinputto8 b/External/dinputto8 index 17fcdef4..827e7b32 160000 --- a/External/dinputto8 +++ b/External/dinputto8 @@ -1 +1 @@ -Subproject commit 17fcdef45ccadd0aaa46664281b5f90b1a1027c7 +Subproject commit 827e7b32d1c89df81ce4f384cf398989aa34fb29 diff --git a/External/imgui b/External/imgui index 9d8de453..3c435c02 160000 --- a/External/imgui +++ b/External/imgui @@ -1 +1 @@ -Subproject commit 9d8de45313c4b6032e09ff00878ec232d389fb8a +Subproject commit 3c435c029788cc26c52e835e2feb262a3057addc diff --git a/d3d9/DebugOverlay.cpp b/d3d9/DebugOverlay.cpp index c4e62f34..76a44c2f 100644 --- a/d3d9/DebugOverlay.cpp +++ b/d3d9/DebugOverlay.cpp @@ -129,8 +129,7 @@ void DebugOverlay::BeginScene() void DebugOverlay::EndScene() { static bool ShowDebugUI = false; - if (ImGui::IsKeyDown(ImGui::GetKeyIndex(ImGuiKey_LeftAlt)) && - ImGui::IsKeyPressed(ImGui::GetKeyIndex(ImGuiKey_D), false)) + if (ImGui::IsKeyDown(ImGuiKey_LeftAlt) && ImGui::IsKeyPressed(ImGuiKey_D, false)) { ShowDebugUI = !ShowDebugUI; } diff --git a/d3d9/IDirect3DDevice9Ex.cpp b/d3d9/IDirect3DDevice9Ex.cpp index ca6f5c20..849b868d 100644 --- a/d3d9/IDirect3DDevice9Ex.cpp +++ b/d3d9/IDirect3DDevice9Ex.cpp @@ -103,6 +103,8 @@ HRESULT m_IDirect3DDevice9Ex::ResetT(T func, D3DPRESENT_PARAMETERS &d3dpp, D3DPR DOverlay.Shutdown(); #endif + ProxyInterface->EndScene(); // Required for some games when using WineD3D + HRESULT hr; // Check fullscreen