hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

keydown/mousedown events that get processed by imgui will no longer be processed by the engine.

Browse Source
This commit is contained in:
Justin Marshall
2020-07-02 12:51:08 -07:00
parent 20a5c42f3a
commit f1b5269d73
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/io/userinput.cpp
+10 -5
View File
@@ -61,6 +61,16 @@ 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:
@@ -216,11 +226,6 @@ 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)