From b33c844d3c5ca10230fb2eb90074846b6a74862b Mon Sep 17 00:00:00 2001 From: Justin Marshall Date: Thu, 2 Jul 2020 13:00:07 -0700 Subject: [PATCH] Backout previous changelist. --- code/redalert/io/userinput.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/code/redalert/io/userinput.cpp b/code/redalert/io/userinput.cpp index 60d3bf1..1d3ce53 100644 --- a/code/redalert/io/userinput.cpp +++ b/code/redalert/io/userinput.cpp @@ -61,16 +61,6 @@ void UserInputClass::Process_Input(KeyNumType& key, int& flags) while (SDL_PollEvent(&event)) { const Uint8* state = SDL_GetKeyboardState(NULL); - if (Debug_Map || renderConsole) - { - // If Imgui has processed a KEYDOWN or MOUSEDOWN event, then we are going to ignore it. - if(ImGui_ImplSDL2_ProcessEvent(&event)) { - if(event.type == SDL_MOUSEBUTTONDOWN || event.type == SDL_KEYDOWN) { - continue; - } - } - } - switch (event.type) { case SDL_SYSWMEVENT: @@ -226,6 +216,11 @@ void UserInputClass::Process_Input(KeyNumType& key, int& flags) KeyB.ASCII = (char)event.text.text[0]; } } + + if (Debug_Map || renderConsole) + { + ImGui_ImplSDL2_ProcessEvent(&event); + } } if (!leftMouseProcessed && numFramesLMouse != 0)