From e8337c783e86016fba7066e1b712d0f87a8b47c0 Mon Sep 17 00:00:00 2001 From: CommonLoon102 <321850+CommonLoon102@users.noreply.github.com> Date: Sun, 8 Sep 2019 13:24:21 +0000 Subject: [PATCH] Don't change item selection with mouse while scanning for new key bind (#159) # Conflicts: # .gitignore --- .gitignore | 3 +++ source/blood/src/gamemenu.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ce50893d3..366ee2402 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,9 @@ apps/ *.ppc *.app +/movie +/blud*.png +/game*.sav *.log *.cache *.cfg diff --git a/source/blood/src/gamemenu.cpp b/source/blood/src/gamemenu.cpp index 468aa8e7a..45af3c6c1 100644 --- a/source/blood/src/gamemenu.cpp +++ b/source/blood/src/gamemenu.cpp @@ -1176,7 +1176,7 @@ void CGameMenuItemKeyList::Draw(void) int my = y<<16; int mw = m_nWidth<<16; int mh = height<<16; - if (bEnable && MOUSEACTIVECONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_mousepos, mx, my, mw, mh))) + if (!bScan && bEnable && MOUSEACTIVECONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_mousepos, mx, my, mw, mh))) { if (MOUSEWATCHPOINTCONDITIONAL(!gGameMenuMgr.MouseOutsideBounds(&gGameMenuMgr.m_prevmousepos, mx, my, mw, mh))) {